11/26

src/main/java/cn/cslg/pas/common/dto/business/AssoTaskFileDTO.java

@@ -24,9 +24,4 @@ public class AssoTaskFileDTO {
      * 说明
      */
     private String description;
-
-//    /**
-//     * 文件类型
-//     */
-//    private Integer fileType;
 }

src/main/java/cn/cslg/pas/common/dto/business/PatentDigProjectFilesDTO.java

@@ -44,7 +44,7 @@ public class PatentDigProjectFilesDTO {
     /**
      * 发生时间
      */
-    private Date event_date;
+    private Date eventDate;
 
     /**
      * 文件类型

src/main/java/cn/cslg/pas/controller/PatentDigProjectFilesController.java

@@ -5,6 +5,9 @@ import cn.cslg.pas.common.dto.business.PatentDigProjectFilesDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.model.request.StringRequest;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.exception.ConditionException;
+import cn.cslg.pas.exception.UnLoginException;
+import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.factorys.businessFactory.Business;
 import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
 import io.swagger.v3.oas.annotations.Operation;
@@ -15,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.IOException;
+import java.util.List;
+
 /**
  * 专利挖掘文件Controller层
  * @Author xiexiang
@@ -39,7 +45,18 @@ public class PatentDigProjectFilesController {
     @PostMapping("/addPatentDigProjectFiles")
     public Response addPatentDigProjectFiles(@RequestBody PatentDigProjectFilesDTO patentDigProjectFilesDTO){
         Business business = businessFactory.getClass("patentDigProjectFilesService");
-        Integer id = (Integer) business.addMessage(patentDigProjectFilesDTO);
+        Integer id = null;
+        try {
+            id = (Integer) business.addMessage(patentDigProjectFilesDTO);
+        } catch (Exception e) {
+            if (e instanceof XiaoShiException) {
+                return Response.error(e.getMessage());
+            } else if (e instanceof UnLoginException) {
+                return Response.unLogin(e.getMessage());
+            } else if (e instanceof ConditionException) {
+                return Response.conditionError(e.getMessage());
+            }
+        }
         return Response.success(id);
     }
 
@@ -50,4 +67,12 @@ public class PatentDigProjectFilesController {
         Integer id = (Integer) business.addMessage(patentDigProjectFilesDTO);
         return Response.success(id);
     }
+
+    @Operation(summary = "删除专利挖掘项目文件")
+    @PostMapping("/deletePatentDigProjectFiles")
+    public String deletePatentDigProjectFiles(@RequestBody List<Integer> ids) throws IOException {
+        Business business = businessFactory.getClass("patentDigProjectFilesService");
+        business.deleteMessage(ids);
+        return Response.success();
+    }
 }

src/main/java/cn/cslg/pas/domain/business/AssoTaskFile.java

@@ -34,12 +34,6 @@ public class AssoTaskFile extends BaseEntity<AssoTaskFile> {
     private String description;
 
     /**
-     * 文件类型
-     */
-    @TableField(value = "file_type")
-    private Integer fileType;
-
-    /**
      * 创建人
      */
     @TableField(value = "create_id")

src/main/java/cn/cslg/pas/service/business/AssoTaskFileService.java

@@ -107,6 +107,7 @@ public class AssoTaskFileService extends ServiceImpl<AssoTaskFileMapper, AssoTas
         }
         return assoTaskFileVOS;
     }
+
     /**
      * 删除任务与文件关联表
      * @param ids

src/main/java/cn/cslg/pas/service/business/PatentDigProjectFilesService.java

@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * 专利挖掘项目文件Service层
  * @Author xiexiang
  * @Date 2023/11/8
  */
@@ -96,15 +97,15 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
             throw new XiaoShiException("传入参数不能为空");
         }
         PatentDigProjectFilesDTO patentDigProjectFilesDTO = (PatentDigProjectFilesDTO) object;
-        if (patentDigProjectFilesDTO.getProjectId().equals(null)) {
+        if (patentDigProjectFilesDTO.getProjectId() == null) {
             throw new XiaoShiException("projectId不能为空");
         }
-        if (patentDigProjectFilesDTO.getFileGuid() != null && patentDigProjectFilesDTO.getFileGuid() != "") {
-            throw new XiaoShiException("文件名不能为空");
-        }
-        if (patentDigProjectFilesDTO.getType().equals(null)) {
-            throw new XiaoShiException("文件类型不能为空");
+        if (patentDigProjectFilesDTO.getFileGuid() == null && patentDigProjectFilesDTO.getFileGuid().equals("")) {
+            throw new XiaoShiException("文件名guid不能为空");
         }
+//        if (patentDigProjectFilesDTO.getType()==null) {
+//            throw new XiaoShiException("文件类型不能为空");
+//        }
         PatentDigProjectFiles patentDigProjectFiles = new PatentDigProjectFiles();
         BeanUtils.copyProperties(patentDigProjectFilesDTO, patentDigProjectFiles);
         //获取登陆人信息 用于设置创建人
@@ -121,16 +122,16 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
 
     @Override
     public Object updateMessage(Object object) {
-        if (object.equals(null)) {
+        if (object == null) {
             throw new XiaoShiException("传入参数不能为空");
         }
         UpdatePatentDigProjectFilesDTO updatePatentDigProjectFilesDTO = (UpdatePatentDigProjectFilesDTO) object;
-        if (updatePatentDigProjectFilesDTO.getProjectId().equals(null)) {
+        if (updatePatentDigProjectFilesDTO.getProjectId() == null) {
             throw new XiaoShiException("projectId不能为空");
         }
-        if (updatePatentDigProjectFilesDTO.getType().equals(null)) {
-            throw new XiaoShiException("文件类型不能为空");
-        }
+//        if (updatePatentDigProjectFilesDTO.getType() == null) {
+//            throw new XiaoShiException("文件类型不能为空");
+//        }
         PatentDigProjectFiles patentDigProjectFiles = this.getById(updatePatentDigProjectFilesDTO.getId());
         BeanUtils.copyProperties(updatePatentDigProjectFilesDTO, patentDigProjectFiles);
         patentDigProjectFiles.updateById();

src/main/resources/jsons/patentDigProjectFiles.json

@@ -4,20 +4,20 @@
     "type": "Integer",
     "value": "id",
     "field": "id",
-    "sqlField": "p.id",
+    "sqlField": "id",
     "sqlClass": "getComSql",
-    "orderClass": "",
-    "groupClass": "",
+    "orderClass": "getComOrder",
+    "groupClass": "getComGroup",
     "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false"
   },
   {
-    "name": "挖掘项目名称",
+    "name": "挖掘项目文件名",
     "type": "String",
     "value": "name",
     "field": "name",
-    "sqlField": "dp.name",
+    "sqlField": "name",
     "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -26,39 +26,39 @@
     "ifShow": "true"
   },
   {
-    "name": "研发项目名称",
-    "type": "String",
-    "value": "rdName",
-    "field": "rdName",
-    "sqlField": "rp.name",
+    "name": "项目id",
+    "type": "Integer",
+    "value": "projectId",
+    "field": "projectId",
+    "sqlField": "project_id",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
     "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow": "true",
+    "ifShow": "false",
     "defaultHidden": "true"
   },
   {
-    "name": "研发项目编号",
-    "type": "String",
-    "value": "rdnumber",
-    "field": "rdnumber",
-    "sqlField": "rp.number",
+    "name": "所属流程id",
+    "type": "Integer",
+    "value": "processId",
+    "field": "processId",
+    "sqlField": "process_id",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "defaultHidden": "true"
   },
   {
-    "name": "产品",
+    "name": "文件guid",
     "type": "String",
-    "value": "product",
-    "field": "product",
-    "sqlField": "rp.product",
+    "value": "fileGuid",
+    "field": "fileGuid",
+    "sqlField": "file_guid",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -68,11 +68,11 @@
     "defaultHidden": "true"
   },
   {
-    "name": "产品阶段",
-    "type": "String",
-    "value": "productPhase",
-    "field": "productPhase",
-    "sqlField": "rp.product_phase",
+    "name": "是否最终",
+    "type": "Boolean",
+    "value": "ifFinal",
+    "field": "ifFinal",
+    "sqlField": "if_final",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -82,11 +82,11 @@
     "defaultHidden": "true"
   },
   {
-    "name": "委托方",
-    "type": "String",
-    "value": "entrustName",
-    "field": "entrustName",
-    "sqlField": "entrust_id",
+    "name": "发生时间",
+    "type": "DateTime",
+    "value": "eventDate",
+    "field": "eventDate",
+    "sqlField": "event_date",
     "sqlClass": "getEntrustTrueNameSql",
     "orderClass": "getEntrustOrder",
     "groupClass": "getEntrustGroup",
@@ -96,137 +96,38 @@
     "defaultHidden": "true"
   },
   {
-    "name": "委托方",
-    "type": "String",
-    "value": "entrustNameTrue",
-    "field": "entrustNameTrue",
-    "sqlField": "entrust_id",
-    "sqlClass": "getEntrustTrueNameSql",
-    "orderClass": "getEntrustOrder",
-    "groupClass": "getEntrustGroup",
+    "name": "文件类型",
+    "type": "Integer",
+    "value": "type",
+    "field": "type",
+    "sqlField": "type",
+    "sqlClass": "",
+    "orderClass": "",
+    "groupClass": "",
     "ifSearch": "false",
     "ifGroup": "true",
     "ifShow": "false",
     "defaultHidden": "false"
   },
   {
-    "name": "负责人名称",
-    "type": "String",
-    "value": "headName",
-    "field": "headName",
-    "sqlField": "p.head_id",
-    "sqlClass": "getCreateNameSql",
-    "orderClass": "getCreateNameOrder",
-    "groupClass": "getComGroup",
-    "ifSearch": "true",
-    "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
-  },
-  {
-    "name": "技术方向",
-    "type": "String",
-    "value": "technicalDirection",
-    "field": "technicalDirection",
-    "sqlField": "dp.technical_direction",
-    "sqlClass": "getLikeSql",
-    "orderClass": "getComOrder",
-    "groupClass": "getComGroup",
-    "ifSearch": "false",
-    "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
-  },
-  {
-    "name": "技术关键词",
-    "type": "String",
-    "value": "technicalKeyword",
-    "field": "technicalKeyword",
-    "sqlField": "dp.technical_keyword",
-    "sqlClass": "getComSql",
-    "orderClass": "getComOrder",
-    "groupClass": "getComGroup",
-    "ifSearch": "false",
-    "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
-  },
-  {
-    "name": "是否检索",
-    "type": "Integer",
-    "value": "ifSearch",
-    "field": "ifSearch",
-    "sqlField": "dp.if_search",
-    "sqlClass": "getComSql",
-    "orderClass": "getComOrder",
-    "groupClass": "getComGroup",
-    "ifSearch": "false",
-    "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
-  },
-  {
-    "name": "产出",
-    "type": "String",
-    "value": "output",
-    "field": "output",
-    "sqlField": "dp.output",
-    "sqlClass": "getLikeSql",
-    "orderClass": "getComOrder",
-    "groupClass": "getComGroup",
-    "ifSearch": "false",
-    "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
-  },
-  {
-    "name": "相关竞争对手",
-    "type": "String",
-    "value": "relatedCompetitors",
-    "field": "relatedCompetitors",
-    "sqlField": "dp.related_competitors",
-    "sqlClass": "getComSql",
-    "orderClass": "getComOrder",
-    "groupClass": "getComGroup",
-    "ifSearch": "false",
-    "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
-  },
-  {
-    "name": "进度",
-    "type": "String",
-    "value": "process",
-    "field": "process",
-    "sqlField": "dp.process",
-    "sqlClass": "getComSql",
-    "orderClass": "getComOrder",
-    "groupClass": "getComGroup",
-    "ifSearch": "false",
-    "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
-  },
-  {
-    "name": "状态",
+    "name": "描述",
     "type": "String",
-    "value": "stateName",
-    "field": "stateName",
-    "sqlField": "dp.state",
+    "value": "description",
+    "field": "description",
+    "sqlField": "description",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
-    "defaultHidden": "true"
   },
   {
     "name": "创建人",
     "type": "String",
     "value": "createName",
     "field": "createName",
-    "sqlField": "p.create_id",
+    "sqlField": "create_id",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "groupClass": "getComGroup",
@@ -239,90 +140,12 @@
     "type": "DateTime",
     "value": "createTime",
     "field": "createTime",
-    "sqlField": "p.create_time",
+    "sqlField": "create_time",
     "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
     "groupClass": "getTimeGroup",
     "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true"
-  },
-  {
-    "name": "描述",
-    "type": "String",
-    "value": "description",
-    "field": "description",
-    "sqlField": "p.description",
-    "sqlClass": "getComSql",
-    "orderClass": "getComOrder",
-    "ifSearch": "false",
-    "ifGroup": "false",
-    "ifShow": "true"
-  },
-  {
-    "name": "相关事件",
-    "type": "Array",
-    "value": "eventNames",
-    "field": "eventNames",
-    "sqlField": "aspe.event_id",
-    "sqlClass": "getComSql",
-    "orderClass": "getEventOrder",
-    "groupClass": "getScenarioGroup",
-    "ifSearch": "false",
-    "ifGroup": "false",
-    "ifShow": "true"
-  },
-  {
-    "name": "相关事件",
-    "type": "String",
-    "value": "eventNames",
-    "field": "eventNames",
-    "sqlField": "aspe.event_id",
-    "sqlClass": "getEventNameSql",
-    "orderClass": "getEventOrder",
-    "groupClass": "getScenarioGroup",
-    "ifSearch": "true",
-    "ifGroup": "false",
-    "ifShow": "false"
-  },
-  {
-    "name": "创建月份",
-    "type": "DateTime",
-    "value": "createTimeMonth",
-    "field": "createTimeMonth",
-    "sqlField": "p.create_time",
-    "sqlClass": "getDateTimeMonthSql",
-    "orderClass": "getComOrder",
-    "groupClass": "getTimeGroup",
-    "ifSearch": "false",
-    "ifGroup": "true",
-    "ifShow": "false"
-  },
-  {
-    "name": "调查类型",
-    "type": "Array",
-    "value": "matterNames",
-    "field": "matterNames",
-    "sqlField": "aspe.matter_id",
-    "sqlClass": "getComSql",
-    "orderClass": "getMatterOrder",
-    "groupClass": "getMatterGroup",
-    "ifSearch": "true",
-    "ifGroup": "true",
-    "ifShow": "false",
-    "defaultHidden": "true"
-  },
-  {
-    "name": "应用场景",
-    "type": "Array",
-    "value": "scenarioNames",
-    "field": "scenarioNames",
-    "sqlField": "aspe.scenario_id",
-    "sqlClass": "getComSql",
-    "orderClass": "getProjectScenarioOrder",
-    "groupClass": "getScenarioGroup",
-    "ifSearch": "true",
-    "ifGroup": "true",
-    "ifShow": "true"
   }
 ]

src/main/resources/mapper/PatentDigProjectFilesMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="cn.cslg.pas.mapper.PatentDigProjectFilesMapper">
     <select id="getPatentDigProjectFiles"  resultType="cn.cslg.pas.common.vo.business.PatentDigProjectFilesVO">
     select id,name,description,project_id as projectId,task_id as taskId,process_id as processId,file_guid as fileGuid,
-           if_final as ifFinal,event_date as eventDate,type,status,create_id as createId,create_time as createTime
+           if_final as ifFinal,event_date as eventDate,type,create_id as createId,create_time as createTime
     from patent_dig_project_files
         <if test="sql1!=''">
         where    ${sql1}