网格员信息管理接口

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/MybatisGeneratorUtils.java

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("tb_info");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_grid_memder_vice");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemGridMemberController.java

@@ -0,0 +1,89 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemGridMember;
+import com.usky.fire.service.DemGridMemberService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 网格员信息管理表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+@RestController
+@RequestMapping("/demGridMember")
+public class DemGridMemberController {
+
+    @Autowired
+    private DemGridMemberService demGridMemberService;
+
+    /**
+     * 网格员信息管理-列表查询
+     *
+     * @param gridArea      网格区域
+     * @param streetTown    街镇
+     * @param gridPersonnel 网格人员姓名
+     * @param id            主键ID
+     * @param pageNum       当前页
+     * @param pageSize      每页条数
+     * @return
+     */
+    @GetMapping("gridMemberList")
+    public ApiResult<CommonPage<DemGridMember>> gridMemberList(@RequestParam(value = "gridArea", required = false) String gridArea,
+                                                               @RequestParam(value = "streetTown", required = false) String streetTown,
+                                                               @RequestParam(value = "gridPersonnel", required = false) String gridPersonnel,
+                                                               @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demGridMemberService.gridMemberList(gridArea, streetTown, gridPersonnel, id, pageNum, pageSize));
+    }
+
+    /**
+     * 网格员信息管理-新增
+     *
+     * @param demGridMember
+     * @return
+     */
+    @Log(title = "网格员信息管理-新增", businessType = BusinessType.INSERT)
+    @PostMapping("addGridMember")
+    public ApiResult<Void> addGridMember(@RequestBody DemGridMember demGridMember) {
+        demGridMemberService.addGridMember(demGridMember);
+        return ApiResult.success();
+    }
+
+    /**
+     * 网格员信息管理-修改
+     *
+     * @param demGridMember
+     * @return
+     */
+    @Log(title = "网格员信息管理-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateGridMember")
+    public ApiResult<Void> updateGridMember(@RequestBody DemGridMember demGridMember) {
+        demGridMemberService.updateGridMember(demGridMember);
+        return ApiResult.success();
+    }
+
+    /**
+     * 网格员信息管理-删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "网格员信息管理-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delGridMember")
+    public ApiResult<Void> delGridMember(@RequestParam(value = "id") Integer id) {
+        demGridMemberService.delGridMember(id);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemGridMemderViceController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 网格员管理附属表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+@Controller
+@RequestMapping("/demGridMemderVice")
+public class DemGridMemderViceController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemGridMember.java

@@ -0,0 +1,79 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 网格员信息管理表
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemGridMember implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 网格区域
+     */
+    private String gridArea;
+
+    /**
+     * 街镇
+     */
+    private String streetTown;
+
+    private String gridPersonnel;
+
+    private String gridPhone;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标识（1、删除；0、未删除）
+     */
+    private String deleteFlag;
+
+    /**
+     * 人员数据
+     */
+    @TableField(exist = false)
+    private List<DemGridMemderVice> gridMemderViceList;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemGridMemderVice.java

@@ -0,0 +1,71 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 网格员管理附属表
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemGridMemderVice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 网格员管理表主键ID
+     */
+    private Integer gridMemberId;
+
+    /**
+     * 人员名称
+     */
+    private String personnelName;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 人员类型：1、网格人员 2、增员干部
+     */
+    private Integer personnelType;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemGridMemberMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemGridMember;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 网格员信息管理表 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+public interface DemGridMemberMapper extends CrudMapper<DemGridMember> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemGridMemderViceMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemGridMemderVice;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 网格员管理附属表 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+public interface DemGridMemderViceMapper extends CrudMapper<DemGridMemderVice> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemGridMemberService.java

@@ -0,0 +1,24 @@
+package com.usky.fire.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DemGridMember;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 网格员信息管理表 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+public interface DemGridMemberService extends CrudService<DemGridMember> {
+
+    CommonPage<DemGridMember> gridMemberList(String gridArea, String streetTown, String gridPersonnel, Integer id, Integer pageNum, Integer pageSize);
+
+    void addGridMember(DemGridMember demGridMember);
+
+    void updateGridMember(DemGridMember demGridMember);
+
+    void delGridMember(Integer id);
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemGridMemderViceService.java

@@ -0,0 +1,27 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemGridMemderVice;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 网格员管理附属表 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+public interface DemGridMemderViceService extends CrudService<DemGridMemderVice> {
+
+    List<DemGridMemderVice> gridMemderViceList(List<Integer> gridMemberIdList);
+
+    void addGridMemderVice(DemGridMemderVice demGridMemderVice);
+
+    void updateGridMemderVice(DemGridMemderVice demGridMemderVice);
+
+    List<String> gridMemderViceLists(Integer gridMemberId);
+
+    void  delGridMemderVice(Integer id);
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemGridMemberServiceImpl.java

@@ -0,0 +1,154 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DemGridMember;
+import com.usky.fire.domain.DemGridMemderVice;
+import com.usky.fire.mapper.DemGridMemberMapper;
+import com.usky.fire.service.DemGridMemberService;
+import com.usky.fire.service.DemGridMemderViceService;
+import com.usky.fire.service.util.OnlineMethod;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 网格员信息管理表 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+@Service
+public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberMapper, DemGridMember> implements DemGridMemberService {
+
+    @Autowired
+    private DemGridMemderViceService demGridMemderViceService;
+
+    @Override
+    public CommonPage<DemGridMember> gridMemberList(String gridArea, String streetTown, String gridPersonnel, Integer id, Integer pageNum, Integer pageSize) {
+        IPage<DemGridMember> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DemGridMember> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DemGridMember::getDeleteFlag, 0)
+                .eq(StringUtils.isNotBlank(streetTown), DemGridMember::getStreetTown, streetTown)
+                .eq(id != null&&id != 0, DemGridMember::getId, id)
+                .like(StringUtils.isNotBlank(gridArea), DemGridMember::getGridArea, gridArea)
+                .like(StringUtils.isNotBlank(gridPersonnel), DemGridMember::getGridPersonnel, gridPersonnel)
+                .orderByDesc(DemGridMember::getId);
+        page = this.page(page, queryWrapper);
+        if (id != 0 && id != null && CollectionUtils.isNotEmpty(page.getRecords())) {
+            List<Integer> gridMemberId = new ArrayList<>();
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                gridMemberId.add(page.getRecords().get(i).getId());
+            }
+            List<DemGridMemderVice> demGridMemderVicesList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(gridMemberId)) {
+                demGridMemderVicesList = demGridMemderViceService.gridMemderViceList(gridMemberId);
+            }
+            if (CollectionUtils.isNotEmpty(demGridMemderVicesList)) {
+                for (int i = 0; i < page.getRecords().size(); i++) {
+                    List<DemGridMemderVice> gridMemderViceList = new ArrayList<>();
+                    for (int j = 0; j < demGridMemderVicesList.size(); j++) {
+                        if (page.getRecords().get(i).getId() == demGridMemderVicesList.get(j).getGridMemberId()) {
+                            gridMemderViceList.add(demGridMemderVicesList.get(j));
+                        }
+
+                    }
+                    page.getRecords().get(i).setGridMemderViceList(gridMemderViceList);
+                }
+            }
+        }
+        return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
+    }
+
+    @Transactional
+    @Override
+    public void addGridMember(DemGridMember demGridMember) {
+        demGridMember.setCreator(SecurityUtils.getUsername());
+        demGridMember.setCreateTime(LocalDateTime.now());
+        demGridMember.setDeleteFlag("0");
+        this.save(demGridMember);
+        Integer gridMemberId = demGridMember.getId();
+        if (CollectionUtils.isNotEmpty(demGridMember.getGridMemderViceList())) {
+            for (int i = 0; i < demGridMember.getGridMemderViceList().size(); i++) {
+                demGridMember.getGridMemderViceList().get(i).setGridMemberId(gridMemberId);
+                demGridMemderViceService.addGridMemderVice(demGridMember.getGridMemderViceList().get(i));
+            }
+        }
+    }
+
+    @Transactional
+    @Override
+    public void updateGridMember(DemGridMember demGridMember) {
+        demGridMember.setUpdatePerson(SecurityUtils.getUsername());
+        demGridMember.setUpdateTime(LocalDateTime.now());
+        this.updateById(demGridMember);
+        if (CollectionUtils.isNotEmpty(demGridMember.getGridMemderViceList())) {
+            List<DemGridMemderVice> addList = new ArrayList<>();
+            List<DemGridMemderVice> updateList = new ArrayList<>();
+            for (int i = 0; i < demGridMember.getGridMemderViceList().size(); i++) {
+                if (demGridMember.getGridMemderViceList().get(i).getId() != 0 && demGridMember.getGridMemderViceList().get(i).getId() != null) {
+                    updateList.add(demGridMember.getGridMemderViceList().get(i));
+                } else {
+                    addList.add(demGridMember.getGridMemderViceList().get(i));
+                }
+            }
+
+            if (CollectionUtils.isNotEmpty(updateList)) {
+                List<String> updateIdList1 = new ArrayList<>();
+                for (int i = 0; i < updateList.size(); i++) {
+                    updateIdList1.add("" + updateList.get(i).getId());
+                }
+                List<String> updateIdList2 = demGridMemderViceService.gridMemderViceLists(demGridMember.getId());
+                if (CollectionUtils.isNotEmpty(updateIdList2)) {
+                    List<String> gridMemderViceList = OnlineMethod.subList1(updateIdList2, updateIdList1);
+                    if (CollectionUtils.isNotEmpty(gridMemderViceList)) {
+                        for (int i = 0; i < gridMemderViceList.size(); i++) {
+                            demGridMemderViceService.delGridMemderVice(Integer.parseInt(gridMemderViceList.get(i)));
+                        }
+                    }
+                }
+
+                for (int i = 0; i < updateList.size(); i++) {
+                    demGridMemderViceService.updateGridMemderVice(updateList.get(i));
+                }
+            }
+
+//            新增
+            if (CollectionUtils.isNotEmpty(addList)) {
+                for (int i = 0; i < addList.size(); i++) {
+                    addList.get(i).setGridMemberId(demGridMember.getId());
+                    demGridMemderViceService.addGridMemderVice(addList.get(i));
+                }
+            }
+        }
+    }
+
+    @Transactional
+    @Override
+    public void delGridMember(Integer id) {
+        DemGridMember demGridMember = new DemGridMember();
+        demGridMember.setId(id);
+        demGridMember.setDeleteFlag("1");
+        this.updateById(demGridMember);
+        List<String> memderViceIdList = demGridMemderViceService.gridMemderViceLists(id);
+        if (CollectionUtils.isNotEmpty(memderViceIdList)) {
+            for (int i = 0; i < memderViceIdList.size(); i++) {
+                demGridMemderViceService.delGridMemderVice(Integer.parseInt(memderViceIdList.get(i)));
+            }
+        }
+    }
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemGridMemderViceServiceImpl.java

@@ -0,0 +1,71 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DemGridMemderVice;
+import com.usky.fire.mapper.DemGridMemderViceMapper;
+import com.usky.fire.service.DemGridMemderViceService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 网格员管理附属表 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+@Service
+public class DemGridMemderViceServiceImpl extends AbstractCrudService<DemGridMemderViceMapper, DemGridMemderVice> implements DemGridMemderViceService {
+
+    @Override
+    public List<DemGridMemderVice> gridMemderViceList(List<Integer> gridMemberIdList) {
+        LambdaQueryWrapper<DemGridMemderVice> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.in(CollectionUtils.isNotEmpty(gridMemberIdList), DemGridMemderVice::getGridMemberId, gridMemberIdList);
+        List<DemGridMemderVice> list = this.list(queryWrapper);
+        return list;
+    }
+
+    @Override
+    public void addGridMemderVice(DemGridMemderVice demGridMemderVice) {
+        demGridMemderVice.setCreateTime(LocalDateTime.now());
+        demGridMemderVice.setCreator(SecurityUtils.getUsername());
+        this.save(demGridMemderVice);
+    }
+
+    @Override
+    public void updateGridMemderVice(DemGridMemderVice demGridMemderVice) {
+        demGridMemderVice.setUpdatePerson(SecurityUtils.getUsername());
+        demGridMemderVice.setUpdateTime(LocalDateTime.now());
+        this.updateById(demGridMemderVice);
+    }
+
+    @Override
+    public List<String> gridMemderViceLists(Integer gridMemberId) {
+        LambdaQueryWrapper<DemGridMemderVice> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemGridMemderVice::getId)
+                .eq(DemGridMemderVice::getGridMemberId, gridMemberId);
+        List<DemGridMemderVice> list = this.list(queryWrapper);
+        List<String> list1 = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (int i = 0; i < list.size(); i++) {
+                list1.add("" + list.get(i).getId());
+            }
+        }
+        return list1;
+    }
+
+    @Override
+    public void delGridMemderVice(Integer id) {
+        this.removeById(id);
+    }
+
+}

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemGridMemberMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.DemGridMemberMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemGridMember">
+        <id column="id" property="id" />
+        <result column="grid_area" property="gridArea" />
+        <result column="street_town" property="streetTown" />
+        <result column="grid_personnel" property="gridPersonnel" />
+        <result column="grid_phone" property="gridPhone" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="update_person" property="updatePerson" />
+        <result column="update_time" property="updateTime" />
+        <result column="delete_flag" property="deleteFlag" />
+    </resultMap>
+
+</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemGridMemderViceMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.DemGridMemderViceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemGridMemderVice">
+        <id column="id" property="id" />
+        <result column="grid_member_id" property="gridMemberId" />
+        <result column="personnel_name" property="personnelName" />
+        <result column="phone" property="phone" />
+        <result column="personnel_type" property="personnelType" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="update_person" property="updatePerson" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>