Merge remote-tracking branch 'origin/master'

one-certificate-manager/db/add_db.sql

@@ -31,9 +31,14 @@ CREATE TABLE `mortals_xhx_child_license`  (
  `formContent` mediumtext COMMENT '提交的表单',
  `processStatus` tinyint(2)    DEFAULT '0'  COMMENT '处理状态(0.未处理,1.已处理)',
  `remark` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+ `reportUserId` bigint(20)  DEFAULT NULL COMMENT '联报用户',
+ `reportUserName` varchar(64)  DEFAULT NULL COMMENT '联报用户名称',
+ `reportTime` datetime DEFAULT NULL COMMENT '联报时间',
  `createTime` datetime(0) NOT NULL  COMMENT '创建时间',
  `createUserId` bigint(20) NOT NULL  COMMENT '创建用户',
+ `createUserName` varchar(64)  DEFAULT NULL COMMENT '创建用户名称',
  `updateUserId` bigint(20)  DEFAULT NULL COMMENT '更新用户',
+ `updateUserName` varchar(64)  DEFAULT NULL COMMENT '更新用户名称',
  `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
  PRIMARY KEY (`id`) USING BTREE,
  KEY `siteId` (`siteId`) USING BTREE,
@@ -43,3 +48,4 @@ CREATE TABLE `mortals_xhx_child_license`  (
  KEY `deptId` (`deptId`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '行业许可子证' ROW_FORMAT = Dynamic;
 
+ALTER TABLE mortals_xhx_child_license ADD COLUMN   `resolutionValue` varchar(64)   DEFAULT ''  COMMENT '设备分辨率'   AFTER resolution;

one-certificate-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -116,9 +116,10 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     }
 
     @RequestMapping("logout")
-    public void logout(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    public Rest<String> logout(HttpServletRequest request, HttpServletResponse response) throws Exception {
         recordSysLog(request, "退出登录");
         super.removeCurrUser(request);
+        return Rest.ok("退出登录成功");
     }
 
     @RequestMapping("index")

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificateDocumentController.java

 package com.mortals.xhx.module.certificate.web;
 
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 /**
 *
@@ -36,6 +38,12 @@ public class CertificateDocumentController extends BaseCRUDJsonBodyMappingContro
     }
 
 
+    @Override
+    protected void doListAfter(CertificateDocumentEntity query, List<CertificateDocumentEntity> list, Context context) throws AppException {
+       list.forEach(item->{
+           item.setFormContent("");
+       });
 
-
+        super.doListAfter(query, list, context);
+    }
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/model/ChildLicenseEntity.java

@@ -11,126 +11,146 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.child.model.vo.ChildLicenseVo;
 import lombok.Data;
 /**
-* 行业许可子证实体对象
-*
-* @author zxfei
-* @date 2024-07-28
-*/
+ * 行业许可子证实体对象
+ *
+ * @author zxfei
+ * @date 2024-07-28
+ */
 @Data
 public class ChildLicenseEntity extends ChildLicenseVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 站点Id
-    */
+     * 站点Id
+     */
     private Long siteId;
     /**
-    * 站点名称
-    */
+     * 站点名称
+     */
     private String siteName;
     /**
-    * 目录id
-    */
+     * 目录id
+     */
     private Long catalogId;
     /**
-    * 目录名称
-    */
+     * 目录名称
+     */
     private String catalogName;
     /**
-    * 申请Id
-    */
+     * 申请Id
+     */
     private Long applyId;
     /**
-    * 子证配置Id
-    */
+     * 子证配置Id
+     */
     private Long documentId;
     /**
-    * 子证名称
-    */
+     * 子证名称
+     */
     private String documentName;
     /**
-    * 部门id
-    */
+     * 部门id
+     */
     private Long deptId;
     /**
-    * 部门名称
-    */
+     * 部门名称
+     */
     private String deptName;
     /**
-    * 市场主体名称
-    */
+     * 市场主体名称
+     */
     private String marketEntityName;
     /**
-    * 许可证编号
-    */
+     * 许可证编号
+     */
     private String licenseCode;
     /**
-    * 法定代表人（负责人）
-    */
+     * 法定代表人（负责人）
+     */
     private String legalPersonName;
     /**
-    * 统一社会信用代码
-    */
+     * 统一社会信用代码
+     */
     private String creditCode;
     /**
-    * 制证日期
-    */
+     * 制证日期
+     */
     private Date productLicenseTime;
     /**
-    * 证件二维码
-    */
+     * 证件二维码
+     */
     private String certQRCode;
     /**
-    * 制证机关
-    */
+     * 制证机关
+     */
     private String certAuthority;
     /**
-    * 经营场所
-    */
+     * 经营场所
+     */
     private String businessPlace;
     /**
-    * 许可项目
-    */
+     * 许可项目
+     */
     private String licensedItems;
     /**
-    * 正本文件名称
-    */
+     * 正本文件名称
+     */
     private String originalFileName;
     /**
-    * 正本文件相对路径地址
-    */
+     * 正本文件相对路径地址
+     */
     private String originalFilePath;
     /**
-    * 副本文件名称
-    */
+     * 副本文件名称
+     */
     private String copyFileName;
     /**
-    * 副本文件相对路径地址
-    */
+     * 副本文件相对路径地址
+     */
     private String copyFilePath;
     /**
-    * 简介
-    */
+     * 简介
+     */
     private String summary;
     /**
-    * 动态表单样式
-    */
+     * 动态表单样式
+     */
     private String formStyleContent;
     /**
-    * 提交的表单
-    */
+     * 提交的表单
+     */
     private String formContent;
     /**
-    * 处理状态(0.未处理,1.已处理)
-    */
+     * 处理状态(0.未处理,1.已处理)
+     */
     private Integer processStatus;
     /**
-    * 备注
-    */
+     * 备注
+     */
     private String remark;
+    /**
+     * 联报用户
+     */
+    private Long reportUserId;
+    /**
+     * 联报用户名称
+     */
+    private String reportUserName;
+    /**
+     * 联报时间
+     */
+    private Date reportTime;
+    /**
+     * 创建用户名称
+     */
+    private String createUserName;
+    /**
+     * 更新用户名称
+     */
+    private String updateUserName;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -138,39 +158,44 @@ public class ChildLicenseEntity extends ChildLicenseVo {
         if (obj instanceof ChildLicenseEntity) {
             ChildLicenseEntity tmp = (ChildLicenseEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.siteId = null;
-            this.siteName = "";
-            this.catalogId = null;
-            this.catalogName = "";
-            this.applyId = null;
-            this.documentId = null;
-            this.documentName = "";
-            this.deptId = null;
-            this.deptName = "";
-            this.marketEntityName = "";
-            this.licenseCode = "";
-            this.legalPersonName = "";
-            this.creditCode = "";
-            this.productLicenseTime = null;
-            this.certQRCode = "";
-            this.certAuthority = "";
-            this.businessPlace = "";
-            this.licensedItems = "";
-            this.originalFileName = "";
-            this.originalFilePath = "";
-            this.copyFileName = "";
-            this.copyFilePath = "";
-            this.summary = "";
-            this.formStyleContent = "";
-            this.formContent = "";
-            this.processStatus = 0;
-            this.remark = "";
+        this.siteId = null;
+        this.siteName = "";
+        this.catalogId = null;
+        this.catalogName = "";
+        this.applyId = null;
+        this.documentId = null;
+        this.documentName = "";
+        this.deptId = null;
+        this.deptName = "";
+        this.marketEntityName = "";
+        this.licenseCode = "";
+        this.legalPersonName = "";
+        this.creditCode = "";
+        this.productLicenseTime = null;
+        this.certQRCode = "";
+        this.certAuthority = "";
+        this.businessPlace = "";
+        this.licensedItems = "";
+        this.originalFileName = "";
+        this.originalFilePath = "";
+        this.copyFileName = "";
+        this.copyFilePath = "";
+        this.summary = "";
+        this.formStyleContent = "";
+        this.formContent = "";
+        this.processStatus = 0;
+        this.remark = "";
+        this.reportUserId = null;
+        this.reportUserName = "";
+        this.reportTime = null;
+        this.createUserName = "";
+        this.updateUserName = "";
     }
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/model/vo/ChildLicenseVo.java

@@ -19,5 +19,10 @@ public class ChildLicenseVo extends BaseEntityLong {
     /** 主键ID，主键，自增长列表 */
     private List <Long> idList;
 
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/service/impl/ChildLicenseServiceImpl.java

@@ -81,4 +81,7 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens
         }
         return result;
     }
+
+
+
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/web/ChildLicenseController.java

 package com.mortals.xhx.module.child.web;
 
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.annotation.DataPermission;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.certificate.model.CertificateDocumentQuery;
+import com.mortals.xhx.module.certificate.service.CertificateDocumentService;
+import com.mortals.xhx.module.device.model.DeviceEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,15 +23,11 @@ import com.mortals.xhx.module.child.service.ChildLicenseService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONObject;
 
-import java.util.Arrays;
-
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -45,8 +45,9 @@ import com.mortals.xhx.common.code.*;
 @RequestMapping("child/license")
 public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<ChildLicenseService, ChildLicenseEntity, Long> {
 
+
     @Autowired
-    private ParamService paramService;
+    private CertificateDocumentService certificateDocumentService;
 
     public ChildLicenseController() {
         super.setModuleDesc("行业许可子证");
@@ -56,6 +57,11 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "legalPersonName", LegalPersonNameEnum.getEnumMap());
         this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+
+        this.addDict(model, "documentId", certificateDocumentService.find(new CertificateDocumentQuery())
+                .stream().collect(Collectors.toMap(x -> x.getId(), y -> y.getDocumentName(), (o, n) -> n)));
+
+
         super.init(model, context);
     }
 
@@ -64,4 +70,47 @@ public class ChildLicenseController extends BaseCRUDJsonBodyMappingController<Ch
     public Rest<Object> list(@RequestBody ChildLicenseEntity query) {
         return super.list(query);
     }
+
+    @Override
+    protected void doListAfter(ChildLicenseEntity query, List<ChildLicenseEntity> list, Context context) throws AppException {
+        list.forEach(item -> {
+            item.setFormContent("");
+            item.setFormStyleContent("");
+        });
+
+        super.doListAfter(query, list, context);
+    }
+
+
+    /**
+     * 子证联报
+     */
+    @PostMapping(value = "report")
+    public String report(@RequestBody ChildLicenseEntity childLicenseEntity) {
+        JSONObject jsonObject = new JSONObject();
+        Map<String, Object> model = new HashMap<>();
+        String busiDesc = this.getModuleDesc() + "联报";
+        try {
+            if (childLicenseEntity.newEntity()) throw new AppException("Id不能为空！");
+            ChildLicenseEntity sourceEntity = this.service.get(childLicenseEntity.getId());
+            if (ProcessStatusEnum.已处理.getValue() == sourceEntity.getProcessStatus())
+                throw new AppException("当前子证已经联报");
+
+            childLicenseEntity.setReportUserId(this.getContextUserId(getContext()));
+            childLicenseEntity.setReportUserName(this.getContext().getUser().getRealName());
+            childLicenseEntity.setReportTime(new Date());
+            childLicenseEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
+
+
+            this.service.update(childLicenseEntity, getContext());
+            recordSysLog(request, busiDesc + " 【成功】");
+            jsonObject.put(KEY_RESULT_DATA, model);
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+        } catch (Exception e) {
+            log.error("子证联报异常", e);
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return jsonObject.toJSONString();
+    }
 }
\ No newline at end of file

one-certificate-manager/src/test/java/com/mortals/httpclient/system.http

@@ -36,4 +36,10 @@ Content-Type: application/json
 POST {{baseUrl}}/user/interlist
 Content-Type: application/json
 
+{}
+
+###获取参数列表
+POST {{baseUrl}}/param/interlist
+Content-Type: application/json
+
 {}
\ No newline at end of file