【工作日志】修改一些类型和字段名

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java

@@ -29,17 +29,17 @@ public class WorkdiaryServiceTypeDTO implements Serializable {
     /**
      * 服务类型
      */
-    private String serviceType;
+    private Short serviceType;
 
     /**
      * 服务类型名称
      */
-    private String serviceName;
+    private String serviceTypeName;
 
     /**
      * 是否启用。0：禁用，1：启用
      */
-    private Integer enabled;
+    private Short enabled;
 
     /**
      * 删除标识 0.未删除 1.已删除

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java

@@ -0,0 +1,10 @@
+package com.epmet.dto.form.workdiaryservice;
+
+import lombok.Data;
+
+@Data
+public class WorkdiaryServiceQueryFormDTO {
+
+
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java

@@ -29,7 +29,7 @@ public class WorkdiaryServiceRecordDTO implements Serializable {
     /**
      * 服务类型
      */
-	private String serviceType;
+	private Short serviceType;
 
     /**
      * 单位ID

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceRecordController.java

@@ -9,9 +9,13 @@ 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.WorkdiaryServiceTypeDTO;
+import com.epmet.dto.form.workdiaryservice.WorkdiaryServiceQueryFormDTO;
 import com.epmet.dto.result.WorkdiaryServiceRecordDTO;
+import com.epmet.entity.WorkdiaryServiceTypeExcel;
 import com.epmet.excel.WorkdiaryServiceRecordExcel;
 import com.epmet.service.WorkdiaryServiceRecordService;
+import com.epmet.service.WorkdiaryServiceTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,56 +31,153 @@ import java.util.Map;
  * @since v1.0.0 2022-08-23
  */
 @RestController
-@RequestMapping("workdiaryServiceRecord")
+@RequestMapping("workdiaryService")
 public class WorkdiaryServiceRecordController {
 
     @Autowired
     private WorkdiaryServiceRecordService workdiaryServiceRecordService;
 
-    @RequestMapping("page")
+    @Autowired
-    public Result<PageData<WorkdiaryServiceRecordDTO>> page(@RequestParam Map<String, Object> params){
+    private WorkdiaryServiceTypeService workdiaryServiceTypeService;
-        PageData<WorkdiaryServiceRecordDTO> page = workdiaryServiceRecordService.page(params);
+
+    /**
+     * 记录-分页
+     * @param params
+     * @return
+     */
+    @RequestMapping("/record/page")
+    public Result<PageData<WorkdiaryServiceRecordDTO>> recordPage(@RequestBody WorkdiaryServiceQueryFormDTO input){
+        PageData<WorkdiaryServiceRecordDTO> page = workdiaryServiceRecordService.page(null);
         return new Result<PageData<WorkdiaryServiceRecordDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    /**
-    public Result<WorkdiaryServiceRecordDTO> get(@PathVariable("id") String id){
+     * 记录-单条
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/record/{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WorkdiaryServiceRecordDTO> recordGet(@PathVariable("id") String id){
         WorkdiaryServiceRecordDTO data = workdiaryServiceRecordService.get(id);
         return new Result<WorkdiaryServiceRecordDTO>().ok(data);
     }
 
+    /**
+     * 记录-保存
+     * @return
+     */
     @NoRepeatSubmit
-    @PostMapping("save")
+    @PostMapping("/record/save")
-    public Result save(@RequestBody WorkdiaryServiceRecordDTO dto){
+    public Result recordSave(@RequestBody WorkdiaryServiceRecordDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         workdiaryServiceRecordService.save(dto);
         return new Result();
     }
 
+    /**
+     * 记录-更新
+     * @param
+     * @return
+     */
     @NoRepeatSubmit
-    @PostMapping("update")
+    @PostMapping("/record/update")
-    public Result update(@RequestBody WorkdiaryServiceRecordDTO dto){
+    public Result recordUpdate(@RequestBody WorkdiaryServiceRecordDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         workdiaryServiceRecordService.update(dto);
         return new Result();
     }
 
-    @PostMapping("delete")
+    /**
-    public Result delete(@RequestBody String[] ids){
+     * 记录-删除
+     * @return
+     */
+    @PostMapping("/record/delete")
+    public Result recordDelete(@RequestBody String[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         workdiaryServiceRecordService.delete(ids);
         return new Result();
     }
 
-    @GetMapping("export")
+    /**
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+     * 记录-导出
+     * @return
+     */
+    @GetMapping("/record/export")
+    public void recordExport(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<WorkdiaryServiceRecordDTO> list = workdiaryServiceRecordService.list(params);
         ExcelUtils.exportExcelToTarget(response, null, list, WorkdiaryServiceRecordExcel.class);
     }
 
+    /**
+     * 服务类型-分页
+     * @return
+     */
+    @RequestMapping("/serviceType/page")
+    public Result<PageData<WorkdiaryServiceTypeDTO>> serviceTypePage(@RequestParam Map<String, Object> params){
+        PageData<WorkdiaryServiceTypeDTO> page = workdiaryServiceTypeService.page(params);
+        return new Result<PageData<WorkdiaryServiceTypeDTO>>().ok(page);
+    }
+
+    /**
+     * 服务类型-单条
+     * @return
+     */
+    @RequestMapping(value = "/serviceType/{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WorkdiaryServiceTypeDTO> serviceTypeGet(@PathVariable("id") String id){
+        WorkdiaryServiceTypeDTO data = workdiaryServiceTypeService.get(id);
+        return new Result<WorkdiaryServiceTypeDTO>().ok(data);
+    }
+
+    /**
+     * 服务类型-保存
+     * @return
+     */
+    @NoRepeatSubmit
+    @PostMapping("/serviceType/save")
+    public Result serviceTypeSave(@RequestBody WorkdiaryServiceTypeDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        workdiaryServiceTypeService.save(dto);
+        return new Result();
+    }
+
+    /**
+     * 服务类型-更新
+     * @return
+     */
+    @NoRepeatSubmit
+    @PostMapping("/serviceType/update")
+    public Result serviceTypeUpdate(@RequestBody WorkdiaryServiceTypeDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        workdiaryServiceTypeService.update(dto);
+        return new Result();
+    }
+
+    /**
+     * 服务类型-删除
+     * @return
+     */
+    @PostMapping("/serviceType/delete")
+    public Result serviceTypeDelete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        workdiaryServiceTypeService.delete(ids);
+        return new Result();
+    }
+
+    /**
+     * 服务类型-导出
+     * @return
+     */
+    @GetMapping("/serviceType/export")
+    public void serviceTypeExport(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WorkdiaryServiceTypeDTO> list = workdiaryServiceTypeService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WorkdiaryServiceTypeExcel.class);
+    }
 
 
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkdiaryServiceTypeController.java

@@ -31,52 +31,9 @@ import java.util.Map;
 @RequestMapping("workdiaryServiceType")
 public class WorkdiaryServiceTypeController {
 
-    @Autowired
-    private WorkdiaryServiceTypeService workdiaryServiceTypeService;
 
-    @RequestMapping("page")
-    public Result<PageData<WorkdiaryServiceTypeDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<WorkdiaryServiceTypeDTO> page = workdiaryServiceTypeService.page(params);
-        return new Result<PageData<WorkdiaryServiceTypeDTO>>().ok(page);
-    }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<WorkdiaryServiceTypeDTO> get(@PathVariable("id") String id){
-        WorkdiaryServiceTypeDTO data = workdiaryServiceTypeService.get(id);
-        return new Result<WorkdiaryServiceTypeDTO>().ok(data);
-    }
 
-    @NoRepeatSubmit
-    @PostMapping("save")
-    public Result save(@RequestBody WorkdiaryServiceTypeDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        workdiaryServiceTypeService.save(dto);
-        return new Result();
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("update")
-    public Result update(@RequestBody WorkdiaryServiceTypeDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        workdiaryServiceTypeService.update(dto);
-        return new Result();
-    }
-
-    @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        workdiaryServiceTypeService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<WorkdiaryServiceTypeDTO> list = workdiaryServiceTypeService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, WorkdiaryServiceTypeExcel.class);
-    }
 
 
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceRecordEntity.java

@@ -29,7 +29,7 @@ public class WorkdiaryServiceRecordEntity extends BaseEpmetEntity {
     /**
      * 服务类型
      */
-	private String serviceType;
+	private Short serviceType;
 
     /**
      * 单位ID

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/WorkdiaryServiceTypeEntity.java

@@ -29,12 +29,12 @@ public class WorkdiaryServiceTypeEntity extends BaseEpmetEntity {
     /**
      * 服务类型
      */
-	private String serviceType;
+	private Short serviceType;
 
     /**
      * 服务类型名称
      */
-	private String serviceName;
+	private String serviceTypeName;
 
     /**
      * 是否启用。0：禁用，1：启用

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/workdiary_service.sql

@@ -3,7 +3,7 @@ CREATE TABLE `workdiary_service_record`
 (
     `ID`           varchar(64) NOT NULL COMMENT '主键',
     `CUSTOMER_ID`  varchar(64) NOT NULL COMMENT '客户id',
-    `SERVICE_TYPE` varchar(32) NOT NULL COMMENT '服务类型',
+    `SERVICE_TYPE` tinyint(1) NOT NULL COMMENT '服务类型',
     `AGENCY_ID` varchar(32) NOT NULL COMMENT '单位ID',
     `GRID_ID` varchar(32) NOT NULL COMMENT '网格ID',
     `ORG_ID_PATH` varchar(255) NOT NULL COMMENT '组织ID path',
@@ -31,8 +31,8 @@ CREATE TABLE `workdiary_service_type`
 (
     `ID`           varchar(64) NOT NULL COMMENT '主键',
     `CUSTOMER_ID`  varchar(64) NOT NULL COMMENT '客户id',
-    `SERVICE_TYPE` varchar(32) NOT NULL COMMENT '服务类型',
+    `SERVICE_TYPE` tinyint(1) NOT NULL COMMENT '服务类型',
-    `SERVICE_NAME` varchar(32) NOT NULL COMMENT '服务类型名称',
+    `SERVICE_TYPE_NAME` varchar(32) NOT NULL COMMENT '服务类型名称',
     `ENABLED` tinyint(1) NOT NULL COMMENT '是否启用。0：禁用，1：启用',
     `DEL_FLAG`     int(11)     NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
     `REVISION`     int(11)     NOT NULL COMMENT '乐观锁',

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/WorkdiaryServiceTypeDao.xml

@@ -7,7 +7,7 @@
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="serviceType" column="SERVICE_TYPE"/>
-        <result property="serviceName" column="SERVICE_NAME"/>
+        <result property="serviceTypeName" column="SERVICE_TYPE_NAME"/>
         <result property="enabled" column="ENABLED"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>