稽核历史

tnc-sms/src/main/java/org/jeecg/modules/smscheck/configs/ObjectComparator.java

@@ -0,0 +1,53 @@
+package org.jeecg.modules.smscheck.configs;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ObjectComparator {
+    public static Map<String, Object> compareObjects(Object obj1, Object obj2) throws IllegalAccessException {
+        Map<String, Object> diffProperties = new HashMap<>();
+
+        Class<?> clazz = obj1.getClass();
+        Field[] fields = clazz.getDeclaredFields();
+
+        for (Field field : fields) {
+            field.setAccessible(true);
+            Object value1 = field.get(obj1);
+            Object value2 = field.get(obj2);
+            if (value1!=null && value2!=null){
+                if (!value1.equals(value2)) {
+                    if (field.getAnnotation(ApiModelProperty.class).value().contains("是否")){
+                        if (value1.equals("1")){
+                            value1="是";
+                        }else {
+                            value1="否";
+                        }
+                        if (value2.equals("1")){
+                            value2="是";
+                        }else {
+                            value2="否";
+                        }
+                    }
+                    if (field.getAnnotation(ApiModelProperty.class).value().contains("稽核结果")){
+                        if (value1.equals("1")){
+                            value1="是";
+                        }else {
+                            value1="否";
+                        }
+                        if (value2.equals("1")){
+                            value2="是";
+                        }else {
+                            value2="否";
+                        }
+                    }
+                    diffProperties.put(field.getAnnotation(ApiModelProperty.class).value(), "原值:"+value2+"  ->  现值:"+value1);
+                }
+            }
+        }
+
+        return diffProperties;
+    }
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerDataController.java

@@ -20,10 +20,12 @@ import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.MinioUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.smscheck.configs.CheckStateCode;
+import org.jeecg.modules.smscheck.configs.ObjectComparator;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataLogService;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataService;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
+import org.jeecg.modules.smscheck.service.SmsCheckZGHistoryService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -33,10 +35,9 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @description 客户资料
@@ -56,6 +57,9 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     private ISmsCheckCustomerDataService customerDataService;
     @Autowired
     private ISmsCheckCustomerInfoService iSmsCheckCustomerInfoService;
+    @Autowired
+    private SmsCheckZGHistoryService smsCheckZGHistoryService;
+
     /**
      * 分页列表查询
      *
@@ -127,7 +131,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @AutoLog(value = "客户资料Log-添加")
     @ApiOperation(value = "客户资料Log-添加", notes = "客户资料Log-添加")
     @PostMapping(value = "/addLog")
-    public Result<String> addLog(@RequestBody SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog) {
+    public Result<String> addLog(@RequestBody SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog) throws IllegalAccessException {
 
         SmsCheckCustomerDataLog smsCheckCustomerDataLog = new SmsCheckCustomerDataLog();
         BeanUtils.copyProperties(smsCheckCustomerDataAndLog,smsCheckCustomerDataLog);
@@ -141,21 +145,46 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
 
         SmsCheckCustomerInfo byId = iSmsCheckCustomerInfoService.getById(smsCheckCustomerDataLog.getInfoId());
         smsCheckCustomerDataLog.setDataId(byId.getDataId());
-        boolean saveLog = checkCustomerDataLogService.saveOrUpdate(smsCheckCustomerDataLog);
-        boolean saveData = customerDataService.saveOrUpdate(smsCheckCustomerData);
 
-        //如果id不是空的 则存在以前数据
+        List<SmsCheckZGHistory> smsCheckZGHistories = new ArrayList<>();
+
+        // SmsCheckCustomerDataLog  如果id不是空的 则存在以前数据
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getId())){
-            SmsCheckCustomerDataLog byId1 = checkCustomerDataLogService.getById(smsCheckCustomerDataLog.getId());
-            Map<String, Object> diffProperties = ObjectComparator.compareObjects(person1, person2);
+            SmsCheckCustomerDataLog checkCustomerDataLog = checkCustomerDataLogService.getById(smsCheckCustomerDataLog.getId());
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(smsCheckCustomerDataLog, checkCustomerDataLog);
             for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
+                SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
+                checkZGHistory.setDataId(byId.getDataId());
+                checkZGHistory.setContext(entry.getValue().toString());
+                checkZGHistory.setUpdateField(entry.getKey());
+                Date date = new Date();
+                SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+                checkZGHistory.setUpdateDate(dateFormat.format(date));
+                smsCheckZGHistories.add(checkZGHistory);
                 System.out.println("Property: " + entry.getKey() + ", Value: " + entry.getValue());
             }
         }
-
-
-
-
+        //SmsCheckCustomerData 如果id不是空的 则存在以前数据
+        if (StringUtils.isNotBlank(smsCheckCustomerData.getId())){
+            SmsCheckCustomerData checkCustomerData = customerDataService.getById(smsCheckCustomerData.getId());
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(smsCheckCustomerData, checkCustomerData);
+            for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
+                SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
+                checkZGHistory.setDataId(byId.getDataId());
+                checkZGHistory.setContext(entry.getValue().toString());
+                checkZGHistory.setUpdateField(entry.getKey());
+                Date date = new Date();
+                SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+                checkZGHistory.setUpdateDate(dateFormat.format(date));
+                smsCheckZGHistories.add(checkZGHistory);
+                System.out.println("Property: " + entry.getKey() + ", Value: " + entry.getValue());
+            }
+        }
+        if (smsCheckZGHistories.size()>0){
+            smsCheckZGHistoryService.saveBatch(smsCheckZGHistories);
+        }
+        boolean saveLog = checkCustomerDataLogService.saveOrUpdate(smsCheckCustomerDataLog);
+        boolean saveData = customerDataService.saveOrUpdate(smsCheckCustomerData);
 
 
         if (saveLog && saveData){
@@ -383,7 +412,9 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         LambdaQueryWrapper<SmsCheckCustomerDataLog> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SmsCheckCustomerDataLog::getInfoId, infoId);
         SmsCheckCustomerDataLog logServiceOne = checkCustomerDataLogService.getOne(queryWrapper);
-
+        LambdaQueryWrapper<SmsCheckZGHistory> var11 = new LambdaQueryWrapper<SmsCheckZGHistory>()
+                .eq(SmsCheckZGHistory::getDataId, smsCheckCustomerData.getId());
+        List<SmsCheckZGHistory> list = smsCheckZGHistoryService.list(var11);
         Map<String, Object> stringObjectMap = BeanUtil.beanToMap(logServiceOne);
         Map<String, Object> stringObjectMap1 = BeanUtil.beanToMap(smsCheckCustomerData);
         if (smsCheckCustomerData!=null){
@@ -395,6 +426,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
             stringObjectMap.remove("id");
             map.putAll(stringObjectMap);
         }
+        map.put("history",list);
         if (smsCheckCustomerData == null) {
             return Result.error("未找到对应数据");
         }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerDataLog.java

@@ -16,7 +16,7 @@ import java.util.Objects;
 @TableName("sms_check_customer_data_log")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="sms_check_customer_data_log对象", description="客户资料稽核结果")
+@ApiModel(value="sms_check_customer_data_log对象", description="客户资料稽核稽核结果")
 public class SmsCheckCustomerDataLog {
 
     /** 主键 */
@@ -27,39 +27,39 @@ public class SmsCheckCustomerDataLog {
     @Excel(name = "客户id", width = 15)
     @ApiModelProperty(value = "客户id")
     private String infoId;
-    @ApiModelProperty(value = "基本信息稽核")
+    @ApiModelProperty(value = "基本信息稽核稽核结果")
     private String infoResult;
-    @ApiModelProperty(value = "基本信息稽核结果备注")
+    @ApiModelProperty(value = "基本信息结果备注")
     private String infoResultRemark;
     @ApiModelProperty(value = "稽核资料ID")
     private String dataId;
 
-    @ApiModelProperty(value = "合同到期时间结果")
+    @ApiModelProperty(value = "合同到期时间稽核结果")
     private String  contractDateResult;
     @ApiModelProperty(value = "合同到期时间结果备注")
     private String contractDateResultRemark;
 
-    @ApiModelProperty(value = "营业执照到期时间结果")
+    @ApiModelProperty(value = "营业执照到期时间稽核结果")
     private String businessLicenseDateResult;
      @ApiModelProperty(value = "营业执照到期时间结果备注")
     private String businessLicenseDateResultRemark;
 
-     @ApiModelProperty(value = "码号证书到期时间结果")
+     @ApiModelProperty(value = "码号证书到期时间稽核结果")
     private String codeNumberDateResult;
      @ApiModelProperty(value = "码号证书到期时间结果备注")
     private String codeNumberDateResultRemark;
 
      @ApiModelProperty(value = "备案通知到期时间结果备注")
     private String filingsDateResultRemark;
-     @ApiModelProperty(value = "备案通知到期时间结果")
+     @ApiModelProperty(value = "备案通知到期时间稽核结果")
     private String filingsDateResult;
 
      @ApiModelProperty(value = "增值业务许可证到期时间结果备注")
     private String permitDateResultRemark;
-     @ApiModelProperty(value = "增值业务许可证到期时间结果")
+     @ApiModelProperty(value = "增值业务许可证到期时间稽核结果")
     private String permitDateResult;
 
-     @ApiModelProperty(value = "法人/责任人证件结果")
+     @ApiModelProperty(value = "法人/责任人证件稽核结果")
     private String corporationCardResult;
      @ApiModelProperty(value = "法人/责任人证件结果备注")
     private String corporationCardResultRemark;
@@ -67,50 +67,50 @@ public class SmsCheckCustomerDataLog {
 
      @ApiModelProperty(value = "责任人授权书结果备注")
     private String personResponsibleResultRemark;
-     @ApiModelProperty(value = "责任人授权书结果")
+     @ApiModelProperty(value = "责任人授权书稽核结果")
     private String personResponsibleResult;
 
-     @ApiModelProperty(value = "经办人证件结果")
+     @ApiModelProperty(value = "经办人证件稽核结果")
     private String operatorCardResult;
      @ApiModelProperty(value = "经办人证件结果备注")
     private String operatorCardResultRemark;
 
      @ApiModelProperty(value = "经办人手持身份证照片结果备注")
     private String operatorCardPhoneResultRemark;
-     @ApiModelProperty(value = "经办人手持身份证照片结果")
+     @ApiModelProperty(value = "经办人手持身份证照片稽核结果")
     private String operatorCardPhoneResult;
 
-     @ApiModelProperty(value = "机房设备照片结果")
+     @ApiModelProperty(value = "机房设备照片稽核结果")
     private String devicePhoneResult;
      @ApiModelProperty(value = "机房设备照片结果备注")
     private String devicePhoneResultRemark;
 
-     @ApiModelProperty(value = "短信模板结果")
+     @ApiModelProperty(value = "短信模板稽核结果")
     private String textMessageResult;
      @ApiModelProperty(value = "短信模板结果备注")
     private String textMessageResultRemark;
 
-     @ApiModelProperty(value = "端口类短信业务责任承诺书结果")
+     @ApiModelProperty(value = "端口类短信业务责任承诺书稽核结果")
     private String textMessageBookResult;
      @ApiModelProperty(value = "端口类短信业务责任承诺书结果备注")
     private String textMessageBookResultRemark;
 
-     @ApiModelProperty(value = "信息安全责任承诺书结果")
+     @ApiModelProperty(value = "信息安全责任承诺书稽核结果")
     private String secureBookResult;
      @ApiModelProperty(value = "信息安全责任承诺书结果备注")
     private String secureBookResultRemark;
 
-     @ApiModelProperty(value = "特殊资费审批结果")
+     @ApiModelProperty(value = "特殊资费审批稽核结果")
     private String specialResult;
      @ApiModelProperty(value = "特殊资费审批结果备注")
     private String specialResultRemark;
 
-    @ApiModelProperty(value = "入网签报结果")
+    @ApiModelProperty(value = "入网签报稽核结果")
     private String networkAccessResult;
      @ApiModelProperty(value = "入网签报结果备注")
     private String networkAccessResultRemark;
 
-     @ApiModelProperty(value = "集团价格审批结果")
+     @ApiModelProperty(value = "集团价格审批稽核结果")
     private String groupPriceApprovalResult;
      @ApiModelProperty(value = "集团价格审批结果备注")
     private String groupPriceApprovalResultRemark;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckZGHistory.java

@@ -0,0 +1,40 @@
+package org.jeecg.modules.smscheck.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@TableName("sms_check_zg_history")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sms_check_zg_history对象", description="整改历史")
+public class SmsCheckZGHistory implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "数据ID")
+    private String dataId;
+
+    @ApiModelProperty(value = "修改内容")
+    private String context;
+
+    @ApiModelProperty(value = "修改字段")
+    private String updateField;
+
+    @ApiModelProperty(value = "编辑时间")
+    private String updateDate;
+
+
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckZGHistoryMapper.java

@@ -0,0 +1,8 @@
+package org.jeecg.modules.smscheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
+import org.jeecg.modules.smscheck.entity.SmsCheckZGHistory;
+
+public interface SmsCheckZGHistoryMapper  extends BaseMapper<SmsCheckZGHistory> {
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/SmsCheckZGHistoryService.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.smscheck.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.smscheck.entity.SmsCheckZGHistory;
+
+public interface SmsCheckZGHistoryService extends IService<SmsCheckZGHistory> {
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SmsCheckZGHistoryServiceImpl.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.smscheck.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
+import org.jeecg.modules.smscheck.entity.SmsCheckZGHistory;
+import org.jeecg.modules.smscheck.mapper.SmsCheckCustomerDataMapper;
+import org.jeecg.modules.smscheck.mapper.SmsCheckZGHistoryMapper;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataService;
+import org.jeecg.modules.smscheck.service.SmsCheckZGHistoryService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SmsCheckZGHistoryServiceImpl  extends ServiceImpl<SmsCheckZGHistoryMapper, SmsCheckZGHistory> implements SmsCheckZGHistoryService {
+}