巡查增加日志记录功能

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java

@@ -0,0 +1,134 @@
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 企事业单位变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-16
+ */
+@Data
+public class IcEnterpriseChangeRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 网格Id【场所区域】
+     */
+	private String gridId;
+
+    /**
+     * 网格所属的组织Id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     */
+	private String agencyPids;
+
+    /**
+     * 场所类型：来源于ic_coverage_category_dict
+     */
+	private String placeType;
+
+    /**
+     * 场所名称
+     */
+	private String placeOrgName;
+
+    /**
+     * 场所地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 字典value,场所规模【
+0:10人以下
+1:10-20人
+2:21-40人
+3:41-100人
+4:100人以上】
+     */
+	private String scale;
+
+    /**
+     * 场所负责人
+     */
+	private String personInCharge;
+
+    /**
+     * 负责人电话
+     */
+	private String mobile;
+
+    /**
+     * 来源【新增:add 导入:import 】
+     */
+	private String sourceType;
+
+    /**
+     * 最新巡查结果【0:合格 1:不合格】
+     */
+	private String latestResult;
+
+    /**
+     * 最新检查时间
+     */
+	private Date latestPatrolTime;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java

@@ -0,0 +1,82 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcEnterpriseChangeRecordDTO;
+import com.epmet.excel.IcEnterpriseChangeRecordExcel;
+import com.epmet.service.IcEnterpriseChangeRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 企事业单位变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-16
+ */
+@RestController
+@RequestMapping("icEnterpriseChangeRecord")
+public class IcEnterpriseChangeRecordController {
+
+    @Autowired
+    private IcEnterpriseChangeRecordService icEnterpriseChangeRecordService;
+
+    @RequestMapping("page")
+    public Result<PageData<IcEnterpriseChangeRecordDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcEnterpriseChangeRecordDTO> page = icEnterpriseChangeRecordService.page(params);
+        return new Result<PageData<IcEnterpriseChangeRecordDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<IcEnterpriseChangeRecordDTO> get(@PathVariable("id") String id){
+        IcEnterpriseChangeRecordDTO data = icEnterpriseChangeRecordService.get(id);
+        return new Result<IcEnterpriseChangeRecordDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody IcEnterpriseChangeRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icEnterpriseChangeRecordService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody IcEnterpriseChangeRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icEnterpriseChangeRecordService.update(dto);
+        return new Result();
+    }
+
+    @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icEnterpriseChangeRecordService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcEnterpriseChangeRecordDTO> list = icEnterpriseChangeRecordService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcEnterpriseChangeRecordExcel.class);
+    }
+
+
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcEnterpriseChangeRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 企事业单位变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-16
+ */
+@Mapper
+public interface IcEnterpriseChangeRecordDao extends BaseDao<IcEnterpriseChangeRecordEntity> {
+	
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java

@@ -0,0 +1,104 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 企事业单位变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_enterprise_change_record")
+public class IcEnterpriseChangeRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 网格Id【场所区域】
+     */
+	private String gridId;
+
+    /**
+     * 网格所属的组织Id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     */
+	private String agencyPids;
+
+    /**
+     * 场所类型：来源于ic_coverage_category_dict
+     */
+	private String placeType;
+
+    /**
+     * 场所名称
+     */
+	private String placeOrgName;
+
+    /**
+     * 场所地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 字典value,场所规模【
+0:10人以下
+1:10-20人
+2:21-40人
+3:41-100人
+4:100人以上】
+     */
+	private String scale;
+
+    /**
+     * 场所负责人
+     */
+	private String personInCharge;
+
+    /**
+     * 负责人电话
+     */
+	private String mobile;
+
+    /**
+     * 来源【新增:add 导入:import 】
+     */
+	private String sourceType;
+
+    /**
+     * 最新巡查结果【0:合格 1:不合格】
+     */
+	private String latestResult;
+
+    /**
+     * 最新检查时间
+     */
+	private Date latestPatrolTime;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java

@@ -0,0 +1,89 @@
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 企事业单位变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-16
+ */
+@Data
+public class IcEnterpriseChangeRecordExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id")
+    private String customerId;
+
+    @Excel(name = "网格Id【场所区域】")
+    private String gridId;
+
+    @Excel(name = "网格所属的组织Id")
+    private String agencyId;
+
+    @Excel(name = "agency_id的所有上级")
+    private String agencyPids;
+
+    @Excel(name = "场所类型：来源于ic_coverage_category_dict")
+    private String placeType;
+
+    @Excel(name = "场所名称")
+    private String placeOrgName;
+
+    @Excel(name = "场所地址")
+    private String address;
+
+    @Excel(name = "经度")
+    private String longitude;
+
+    @Excel(name = "纬度")
+    private String latitude;
+
+    @Excel(name = "字典value,场所规模【
+0:10人以下
+1:10-20人
+2:21-40人
+3:41-100人
+4:100人以上】")
+    private String scale;
+
+    @Excel(name = "场所负责人")
+    private String personInCharge;
+
+    @Excel(name = "负责人电话")
+    private String mobile;
+
+    @Excel(name = "来源【新增:add 导入:import 】")
+    private String sourceType;
+
+    @Excel(name = "最新巡查结果【0:合格 1:不合格】")
+    private String latestResult;
+
+    @Excel(name = "最新检查时间")
+    private Date latestPatrolTime;
+
+    @Excel(name = "删除标识：0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcEnterpriseChangeRecordRedis.java

@@ -0,0 +1,30 @@
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 企事业单位变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-16
+ */
+@Component
+public class IcEnterpriseChangeRecordRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseChangeRecordService.java

@@ -0,0 +1,78 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcEnterpriseChangeRecordDTO;
+import com.epmet.entity.IcEnterpriseChangeRecordEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 企事业单位变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-16
+ */
+public interface IcEnterpriseChangeRecordService extends BaseService<IcEnterpriseChangeRecordEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcEnterpriseChangeRecordDTO>
+     * @author generator
+     * @date 2022-08-16
+     */
+    PageData<IcEnterpriseChangeRecordDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcEnterpriseChangeRecordDTO>
+     * @author generator
+     * @date 2022-08-16
+     */
+    List<IcEnterpriseChangeRecordDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcEnterpriseChangeRecordDTO
+     * @author generator
+     * @date 2022-08-16
+     */
+    IcEnterpriseChangeRecordDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-08-16
+     */
+    void save(IcEnterpriseChangeRecordDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-08-16
+     */
+    void update(IcEnterpriseChangeRecordDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-08-16
+     */
+    void delete(String[] ids);
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java

@@ -0,0 +1,87 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IcEnterpriseChangeRecordDao;
+import com.epmet.dto.IcEnterpriseChangeRecordDTO;
+import com.epmet.entity.IcEnterpriseChangeRecordEntity;
+import com.epmet.redis.IcEnterpriseChangeRecordRedis;
+import com.epmet.service.IcEnterpriseChangeRecordService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 企事业单位变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-16
+ */
+@Service
+public class IcEnterpriseChangeRecordServiceImpl extends BaseServiceImpl<IcEnterpriseChangeRecordDao, IcEnterpriseChangeRecordEntity> implements IcEnterpriseChangeRecordService {
+
+    @Autowired
+    private IcEnterpriseChangeRecordRedis icEnterpriseChangeRecordRedis;
+
+    @Override
+    public PageData<IcEnterpriseChangeRecordDTO> page(Map<String, Object> params) {
+        IPage<IcEnterpriseChangeRecordEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcEnterpriseChangeRecordDTO.class);
+    }
+
+    @Override
+    public List<IcEnterpriseChangeRecordDTO> list(Map<String, Object> params) {
+        List<IcEnterpriseChangeRecordEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcEnterpriseChangeRecordDTO.class);
+    }
+
+    private QueryWrapper<IcEnterpriseChangeRecordEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcEnterpriseChangeRecordEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcEnterpriseChangeRecordDTO get(String id) {
+        IcEnterpriseChangeRecordEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcEnterpriseChangeRecordDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcEnterpriseChangeRecordDTO dto) {
+        IcEnterpriseChangeRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcEnterpriseChangeRecordEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcEnterpriseChangeRecordDTO dto) {
+        IcEnterpriseChangeRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcEnterpriseChangeRecordEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml

@@ -0,0 +1,32 @@
+<?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.epmet.dao.IcEnterpriseChangeRecordDao">
+
+    <resultMap type="com.epmet.entity.IcEnterpriseChangeRecordEntity" id="icEnterpriseChangeRecordMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="agencyPids" column="AGENCY_PIDS"/>
+        <result property="placeType" column="PLACE_TYPE"/>
+        <result property="placeOrgName" column="PLACE_ORG_NAME"/>
+        <result property="address" column="ADDRESS"/>
+        <result property="longitude" column="LONGITUDE"/>
+        <result property="latitude" column="LATITUDE"/>
+        <result property="scale" column="SCALE"/>
+        <result property="personInCharge" column="PERSON_IN_CHARGE"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="sourceType" column="SOURCE_TYPE"/>
+        <result property="latestResult" column="LATEST_RESULT"/>
+        <result property="latestPatrolTime" column="LATEST_PATROL_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>