代码备份

src/main/java/com/glxp/api/controller/auth/ResgitserCertController.java

@@ -0,0 +1,109 @@
+package com.glxp.api.controller.auth;
+
+import cn.hutool.core.util.IdUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.sup.UserCertEntity;
+import com.glxp.api.entity.sup.UserCertSetEntity;
+import com.glxp.api.req.purchase.certRequest;
+import com.glxp.api.req.system.DeleteCompanyFileRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.sup.UserCertService;
+import com.glxp.api.service.sup.UserCertSetService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author : zhangsan
+ * @date : 2023/5/18 9:38
+ * @modyified By :
+ */
+@ApiIgnore
+@RestController
+public class ResgitserCertController {
+    @Resource
+    private UserCertService userCertService;
+    @Value("${file_path}")
+    private String filePath;
+    @Resource
+    private UserCertSetService userCertSetService;
+
+
+    @GetMapping("/reg/company/cert/filterList")
+    public BaseResponse filterCompanyCert(certRequest certRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<UserCertEntity> userCertEntities = userCertService.selectBybId(certRequest);
+        PageInfo<UserCertEntity> pageInfo;
+        pageInfo = new PageInfo<>(userCertEntities);
+        PageSimpleResponse<UserCertEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(userCertEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    //资质证书添加
+    @PostMapping("/reg/company/cert/isertCert")
+    public BaseResponse isertCert(@RequestBody UserCertEntity userCert) {
+        userCert.setCreateTime(new Date());
+        userCert.setUpdateTime(new Date());
+        userCert.setStatus(1 + "");
+        userCert.setCheckStatus(0 + "");
+        userCert.setId(IdUtil.getSnowflakeNextId());
+        userCertService.insertCert(userCert);
+        return ResultVOUtils.success("成功");
+    }
+
+    //删除
+    @PostMapping("/reg/company/cert/deleteCert")
+    public BaseResponse deleteCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest) {
+        boolean b = userCertService.deleteById(deleteCompanyFileRequest.getId());
+        String URL = filePath + "/register/file/image2/" + deleteCompanyFileRequest.getFilePath();
+        File file = new File(URL);
+        if (file.exists() && file.isFile()) {
+            file.delete();
+        }
+        return ResultVOUtils.success("成功");
+    }
+
+    //修改
+    @PostMapping("/reg/info/updateCert")
+    public BaseResponse updateCert(@RequestBody UserCertEntity userCert) {
+
+        if (userCert.getValidDate() != null && userCert.getExpireDate() != null) {
+            if (userCert.getValidDate().getTime() > userCert.getExpireDate().getTime()) {
+                return ResultVOUtils.error(999, "生效期不能小于失效期！");
+            }
+        }
+        userCertService.updateCert(userCert);
+
+        if ("key".equals(userCert.getKey())) {
+            //插入记录表中
+            UserCertSetEntity userCertSetEntity = new UserCertSetEntity();
+            userCertSetEntity.setId(IdUtil.getSnowflakeNextId());
+            userCertSetEntity.setCreateTime(new Date());
+            userCertSetEntity.setCreateUser(userCert.getCreateUser());
+            userCertSetEntity.setName(userCert.getName());
+            userCertSetService.insert(userCertSetEntity);
+
+        }
+
+        return ResultVOUtils.success("修改成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/purchase/SupCertController.java

@@ -65,8 +65,6 @@ import java.util.stream.Collectors;
 @ApiIgnore
 @RestController
 public class SupCertController {
-    @Resource
-    private UserCertService userCertService;
     @Resource
     private AuthAdminService authAdminService;
     @Resource
@@ -81,11 +79,11 @@ public class SupCertController {
     private SystemPDFModuleService systemPDFModuleService;
 
     @GetMapping("/sup/company/cert/filterList")
-    public BaseResponse filterCompanyCert(certRequest certRequest , BindingResult bindingResult){
+    public BaseResponse filterCompanyCert(certRequest certRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<UserCertEntity> userCertEntities = userCertService.selectBybId(certRequest);
+        List<UserCertEntity> userCertEntities = supCertService.selectBybId(certRequest);
         PageInfo<UserCertEntity> pageInfo;
         pageInfo = new PageInfo<>(userCertEntities);
         PageSimpleResponse<UserCertEntity> pageSimpleResponse = new PageSimpleResponse<>();
@@ -93,12 +91,13 @@ public class SupCertController {
         pageSimpleResponse.setList(userCertEntities);
         return ResultVOUtils.success(pageSimpleResponse);
     }
+
     @GetMapping("/sup/company/cert/filterZcList")
-    public BaseResponse filterZcCert(certRequest certRequest , BindingResult bindingResult){
+    public BaseResponse filterZcCert(certRequest certRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<UserCertEntity> userCertEntities = userCertService.selectByzcId(certRequest);
+        List<UserCertEntity> userCertEntities = supCertService.selectByzcId(certRequest);
         PageInfo<UserCertEntity> pageInfo;
         pageInfo = new PageInfo<>(userCertEntities);
         PageSimpleResponse<UserCertEntity> pageSimpleResponse = new PageSimpleResponse<>();
@@ -106,10 +105,11 @@ public class SupCertController {
         pageSimpleResponse.setList(userCertEntities);
         return ResultVOUtils.success(pageSimpleResponse);
     }
+
     @AuthRuleAnnotation("")
     @GetMapping("/sup/company/cert/filter")
     public BaseResponse filterUserCompanyCert(FilterSupCertRequest filterSupCertRequest,
-                                          BindingResult bindingResult) {
+                                              BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
@@ -519,7 +519,7 @@ public class SupCertController {
         }
 
         String param = JSON.toJSONString(list);
-        JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
+        JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
     }
 
     /**
@@ -634,7 +634,7 @@ public class SupCertController {
         }
 
         String param = JSON.toJSONString(list);
-        JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
+        JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
     }
 
     /**
@@ -692,7 +692,7 @@ public class SupCertController {
                     supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
                     supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
                     supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark());
-                    supData.put("filePath", filePath + "register/image2/" + url);
+                    supData.put("filePath", filePath + "re gister/image2/" + url);
                     list.add(supData);
                     i++;
                 }
@@ -700,7 +700,7 @@ public class SupCertController {
         }
 
         String param = JSON.toJSONString(list);
-        JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
+        JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
     }
 
     //首营预览文件
@@ -727,7 +727,7 @@ public class SupCertController {
         return ResultVOUtils.success(list);
     }
 
-//    @Resource
+    //    @Resource
 //    private AuthAdminService authAdminService;
 //    @Resource
 //    private UserCertService userCertService;
@@ -735,7 +735,8 @@ public class SupCertController {
 //    private String filePath;
     @Resource
     private UserCertSetService userCertSetService;
-//    @Resource
+
+    //    @Resource
 //    private SystemPDFTemplateService systemPDFTemplateService;
 //    @Resource
 //    private SystemPDFModuleService systemPDFModuleService;
@@ -757,23 +758,23 @@ public class SupCertController {
 //
 //
     //资质证书添加
-    @ApiOperation(value = "资质证书添加",response = BaseResponse.class)
+    @ApiOperation(value = "资质证书添加", response = BaseResponse.class)
     @PostMapping("/sup/company/cert/isertCert")
-    public BaseResponse isertCert(@RequestBody UserCertEntity userCert){
+    public BaseResponse isertCert(@RequestBody UserCertEntity userCert) {
         userCert.setCreateTime(new Date());
         userCert.setUpdateTime(new Date());
-        userCert.setStatus(1+"");
+        userCert.setStatus(1 + "");
-        userCert.setCheckStatus(0+"");
+        userCert.setCheckStatus(0 + "");
         userCert.setId(IdUtil.getSnowflakeNextId());
-        userCertService.insertCert(userCert);
+        supCertService.insertCert(userCert);
         return ResultVOUtils.success("成功");
     }
 
     //删除
-    @ApiOperation(value = "删除资质证书",response = BaseResponse.class)
+    @ApiOperation(value = "删除资质证书", response = BaseResponse.class)
     @PostMapping("/sup/company/cert/deleteCert")
-    public BaseResponse deleteCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest){
+    public BaseResponse deleteCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest) {
-        boolean b = userCertService.deleteById(deleteCompanyFileRequest.getId());
+        boolean b = supCertService.deleteById(deleteCompanyFileRequest.getId());
         String URL = filePath + "/register/file/image2/" + deleteCompanyFileRequest.getFilePath();
         File file = new File(URL);
         if (file.exists() && file.isFile()) {
@@ -781,7 +782,8 @@ public class SupCertController {
         }
         return ResultVOUtils.success("成功");
     }
-//
+
+    //
 //
 //
 //    //首营预览文件
@@ -798,18 +800,18 @@ public class SupCertController {
 //    }
 //
     //修改
-    @ApiOperation(value = "修改资质证书",response = BaseResponse.class)
+    @ApiOperation(value = "修改资质证书", response = BaseResponse.class)
     @PostMapping("/sup/info/updateCert")
-    public BaseResponse updateCert(@RequestBody UserCertEntity userCert){
+    public BaseResponse updateCert(@RequestBody UserCertEntity userCert) {
 
         if (userCert.getValidDate() != null && userCert.getExpireDate() != null) {
             if (userCert.getValidDate().getTime() > userCert.getExpireDate().getTime()) {
                 return ResultVOUtils.error(999, "生效期不能小于失效期！");
             }
         }
-        userCertService.updateCert(userCert);
+        supCertService.updateCert(userCert);
 
-        if("key".equals(userCert.getKey())){
+        if ("key".equals(userCert.getKey())) {
             //插入记录表中
             UserCertSetEntity userCertSetEntity = new UserCertSetEntity();
             userCertSetEntity.setId(IdUtil.getSnowflakeNextId());

src/main/java/com/glxp/api/controller/trace/UdiTraceController.java

@@ -147,8 +147,6 @@ public class UdiTraceController extends BaseController {
             for (UserCompanyResponse userCompanyResponse : userCompanyResponses) {
                 udiTraceService.createSourceTraceTask(traceProductDetailEntity, userCompanyResponse.getId());
             }
-
-
         } else {
             //1:校验参数是否正确
             if (StrUtil.isEmpty(traceRecordRequest.getYlqxzcrbarmc())) {
@@ -195,8 +193,6 @@ public class UdiTraceController extends BaseController {
             for (UserCompanyResponse userCompanyResponse : userCompanyResponses) {
                 udiTraceService.createSourceTraceTask(traceProductDetailEntity, userCompanyResponse.getId());
             }
-
-
         }
 //        List<TraceOrderEntity> traceOrderEntities = traceOrderService.findByProductIdFk(traceRecordLogEntity.getTraceProductIdFk());
         return ResultVOUtils.success(traceRecordLogEntity.getRecordCode());

src/main/java/com/glxp/api/dao/sup/UserCertMapper.java

@@ -16,5 +16,6 @@ public interface UserCertMapper extends BaseMapper<UserCertEntity> {
     List<UserCertEntity> selectByRegisterId(@Param("registerId") String registerId);
 
     List<UserCertEntity> filterCompanyCert(certRequest certRequest);
+
     List<UserCertEntity> filterZcCert(certRequest certRequest);
 }

src/main/java/com/glxp/api/entity/basic/BasicUdiProductEntity.java

@@ -273,6 +273,7 @@ public class BasicUdiProductEntity implements Serializable {
     private Boolean isNewest;
 
     /**
+     *
      * 更新时间
      */
     @ApiModelProperty(value = "更新时间")

src/main/java/com/glxp/api/entity/sup/UserCertEntity.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -13,8 +14,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
-    * 资质证书信息与路径表
+ * 资质证书信息与路径表
-    */
+ */
 @ApiModel("资质证书信息与路径表")
 @Data
 @TableName(value = "user_cert")
@@ -134,9 +135,5 @@ public class UserCertEntity implements Serializable {
     private String customerId;
 
 
-
-
-
-
     private static final long serialVersionUID = 1L;
 }