diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java new file mode 100644 index 0000000..def918d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.controller; + + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.service.MeterWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作台相关接口") +@RestController +@RequestMapping("/workbench") +public class MeterWorkbenchController { + + @Resource + private MeterWorkbenchService meterWorkbenchService; + + /** + * 证书列表查询 + * @return + */ + @ApiOperation("我的证书列表查询") + @PostMapping("/queryStaffCertificate") + @ResponseBody + public ReturnDTO queryStaffCertificate(@RequestBody MeterWorkbenchRequest workbenchRequest) { + return meterWorkbenchService.queryStaffCertificate(workbenchRequest); + } + + /** + * 计量人员统计 + * @return + */ + @ApiOperation("计量人员统计") + @PostMapping("/meterStaffStatistic") + @ResponseBody + public ReturnDTO meterStaffStatistic() { + return meterWorkbenchService.meterStaffStatistic(); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java new file mode 100644 index 0000000..def918d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.controller; + + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.service.MeterWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作台相关接口") +@RestController +@RequestMapping("/workbench") +public class MeterWorkbenchController { + + @Resource + private MeterWorkbenchService meterWorkbenchService; + + /** + * 证书列表查询 + * @return + */ + @ApiOperation("我的证书列表查询") + @PostMapping("/queryStaffCertificate") + @ResponseBody + public ReturnDTO queryStaffCertificate(@RequestBody MeterWorkbenchRequest workbenchRequest) { + return meterWorkbenchService.queryStaffCertificate(workbenchRequest); + } + + /** + * 计量人员统计 + * @return + */ + @ApiOperation("计量人员统计") + @PostMapping("/meterStaffStatistic") + @ResponseBody + public ReturnDTO meterStaffStatistic() { + return meterWorkbenchService.meterStaffStatistic(); + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java new file mode 100644 index 0000000..2fa740b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums; + +public enum MeterRoleTypeEnum { + + METER_DEPT_ADMIN("2", "计量部门负责人"); + + private String code; + private String value; + + MeterRoleTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java new file mode 100644 index 0000000..def918d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.controller; + + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.service.MeterWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作台相关接口") +@RestController +@RequestMapping("/workbench") +public class MeterWorkbenchController { + + @Resource + private MeterWorkbenchService meterWorkbenchService; + + /** + * 证书列表查询 + * @return + */ + @ApiOperation("我的证书列表查询") + @PostMapping("/queryStaffCertificate") + @ResponseBody + public ReturnDTO queryStaffCertificate(@RequestBody MeterWorkbenchRequest workbenchRequest) { + return meterWorkbenchService.queryStaffCertificate(workbenchRequest); + } + + /** + * 计量人员统计 + * @return + */ + @ApiOperation("计量人员统计") + @PostMapping("/meterStaffStatistic") + @ResponseBody + public ReturnDTO meterStaffStatistic() { + return meterWorkbenchService.meterStaffStatistic(); + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java new file mode 100644 index 0000000..2fa740b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums; + +public enum MeterRoleTypeEnum { + + METER_DEPT_ADMIN("2", "计量部门负责人"); + + private String code; + private String value; + + MeterRoleTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java index 1bd5a6f..62ed945 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; +import com.casic.missiles.dto.meter.StaffCertificateResponse; import com.casic.missiles.model.MeterStaff; import org.apache.ibatis.annotations.Param; @@ -27,4 +28,6 @@ MeterStaff selectStaffInfo(@Param("id")String id); void addStaffList(@Param("list") List list); + + List meterStaffStatistic(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java new file mode 100644 index 0000000..def918d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.controller; + + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.service.MeterWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作台相关接口") +@RestController +@RequestMapping("/workbench") +public class MeterWorkbenchController { + + @Resource + private MeterWorkbenchService meterWorkbenchService; + + /** + * 证书列表查询 + * @return + */ + @ApiOperation("我的证书列表查询") + @PostMapping("/queryStaffCertificate") + @ResponseBody + public ReturnDTO queryStaffCertificate(@RequestBody MeterWorkbenchRequest workbenchRequest) { + return meterWorkbenchService.queryStaffCertificate(workbenchRequest); + } + + /** + * 计量人员统计 + * @return + */ + @ApiOperation("计量人员统计") + @PostMapping("/meterStaffStatistic") + @ResponseBody + public ReturnDTO meterStaffStatistic() { + return meterWorkbenchService.meterStaffStatistic(); + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java new file mode 100644 index 0000000..2fa740b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums; + +public enum MeterRoleTypeEnum { + + METER_DEPT_ADMIN("2", "计量部门负责人"); + + private String code; + private String value; + + MeterRoleTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java index 1bd5a6f..62ed945 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; +import com.casic.missiles.dto.meter.StaffCertificateResponse; import com.casic.missiles.model.MeterStaff; import org.apache.ibatis.annotations.Param; @@ -27,4 +28,6 @@ MeterStaff selectStaffInfo(@Param("id")String id); void addStaffList(@Param("list") List list); + + List meterStaffStatistic(); } diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml index 6a46132..0c4a29d 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml @@ -6,7 +6,7 @@ INSERT INTO meter_certificate_expire_message ( `id`, `staff_id`, `certificate_id`, `staff_no`, `certificate_no`, `certificate_name`, `valid_date`, `status` ) VALUES - (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},#{bean.validDate},0) + (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'),,0) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java new file mode 100644 index 0000000..def918d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.controller; + + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.service.MeterWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作台相关接口") +@RestController +@RequestMapping("/workbench") +public class MeterWorkbenchController { + + @Resource + private MeterWorkbenchService meterWorkbenchService; + + /** + * 证书列表查询 + * @return + */ + @ApiOperation("我的证书列表查询") + @PostMapping("/queryStaffCertificate") + @ResponseBody + public ReturnDTO queryStaffCertificate(@RequestBody MeterWorkbenchRequest workbenchRequest) { + return meterWorkbenchService.queryStaffCertificate(workbenchRequest); + } + + /** + * 计量人员统计 + * @return + */ + @ApiOperation("计量人员统计") + @PostMapping("/meterStaffStatistic") + @ResponseBody + public ReturnDTO meterStaffStatistic() { + return meterWorkbenchService.meterStaffStatistic(); + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java new file mode 100644 index 0000000..2fa740b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums; + +public enum MeterRoleTypeEnum { + + METER_DEPT_ADMIN("2", "计量部门负责人"); + + private String code; + private String value; + + MeterRoleTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java index 1bd5a6f..62ed945 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; +import com.casic.missiles.dto.meter.StaffCertificateResponse; import com.casic.missiles.model.MeterStaff; import org.apache.ibatis.annotations.Param; @@ -27,4 +28,6 @@ MeterStaff selectStaffInfo(@Param("id")String id); void addStaffList(@Param("list") List list); + + List meterStaffStatistic(); } diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml index 6a46132..0c4a29d 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml @@ -6,7 +6,7 @@ INSERT INTO meter_certificate_expire_message ( `id`, `staff_id`, `certificate_id`, `staff_no`, `certificate_no`, `certificate_name`, `valid_date`, `status` ) VALUES - (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},#{bean.validDate},0) + (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'),,0) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml index 83470e4..383646a 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml @@ -8,8 +8,8 @@ VALUES (#{bean.certificateId}, #{bean.id}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) @@ -19,8 +19,8 @@ VALUES (#{bean.id}, #{bean.staffNo}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java new file mode 100644 index 0000000..def918d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.controller; + + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.service.MeterWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作台相关接口") +@RestController +@RequestMapping("/workbench") +public class MeterWorkbenchController { + + @Resource + private MeterWorkbenchService meterWorkbenchService; + + /** + * 证书列表查询 + * @return + */ + @ApiOperation("我的证书列表查询") + @PostMapping("/queryStaffCertificate") + @ResponseBody + public ReturnDTO queryStaffCertificate(@RequestBody MeterWorkbenchRequest workbenchRequest) { + return meterWorkbenchService.queryStaffCertificate(workbenchRequest); + } + + /** + * 计量人员统计 + * @return + */ + @ApiOperation("计量人员统计") + @PostMapping("/meterStaffStatistic") + @ResponseBody + public ReturnDTO meterStaffStatistic() { + return meterWorkbenchService.meterStaffStatistic(); + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java new file mode 100644 index 0000000..2fa740b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums; + +public enum MeterRoleTypeEnum { + + METER_DEPT_ADMIN("2", "计量部门负责人"); + + private String code; + private String value; + + MeterRoleTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java index 1bd5a6f..62ed945 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; +import com.casic.missiles.dto.meter.StaffCertificateResponse; import com.casic.missiles.model.MeterStaff; import org.apache.ibatis.annotations.Param; @@ -27,4 +28,6 @@ MeterStaff selectStaffInfo(@Param("id")String id); void addStaffList(@Param("list") List list); + + List meterStaffStatistic(); } diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml index 6a46132..0c4a29d 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml @@ -6,7 +6,7 @@ INSERT INTO meter_certificate_expire_message ( `id`, `staff_id`, `certificate_id`, `staff_no`, `certificate_no`, `certificate_name`, `valid_date`, `status` ) VALUES - (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},#{bean.validDate},0) + (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'),,0) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml index 83470e4..383646a 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml @@ -8,8 +8,8 @@ VALUES (#{bean.certificateId}, #{bean.id}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) @@ -19,8 +19,8 @@ VALUES (#{bean.id}, #{bean.staffNo}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml index 346076e..81101aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml @@ -25,8 +25,8 @@ VALUES (#{bean.id}, #{bean.name}, #{bean.idCard}, #{bean.account}, #{bean.staffNo} - , #{bean.sex}, DATE_FORMAT(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} - , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, DATE_FORMAT(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} + , #{bean.sex}, STR_TO_DATE(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} + , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, STR_TO_DATE(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} , #{bean.mainExaminer}, #{bean.specialOperator}, #{bean.remark} ) @@ -94,7 +94,21 @@ meter_staff t where t.id =#{id} - + SELECT + DATE_FORMAT( work_date, '%Y-%m' ) AS `date`, + COUNT( 1 ) AS `count` + FROM + meter_staff + WHERE + is_del = 0 + GROUP BY + DATE_FORMAT( work_date, '%Y-%m' ) + ORDER BY + DATE_FORMAT( work_date, '%Y-%m' ) + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java new file mode 100644 index 0000000..def918d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.controller; + + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.service.MeterWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作台相关接口") +@RestController +@RequestMapping("/workbench") +public class MeterWorkbenchController { + + @Resource + private MeterWorkbenchService meterWorkbenchService; + + /** + * 证书列表查询 + * @return + */ + @ApiOperation("我的证书列表查询") + @PostMapping("/queryStaffCertificate") + @ResponseBody + public ReturnDTO queryStaffCertificate(@RequestBody MeterWorkbenchRequest workbenchRequest) { + return meterWorkbenchService.queryStaffCertificate(workbenchRequest); + } + + /** + * 计量人员统计 + * @return + */ + @ApiOperation("计量人员统计") + @PostMapping("/meterStaffStatistic") + @ResponseBody + public ReturnDTO meterStaffStatistic() { + return meterWorkbenchService.meterStaffStatistic(); + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java new file mode 100644 index 0000000..2fa740b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums; + +public enum MeterRoleTypeEnum { + + METER_DEPT_ADMIN("2", "计量部门负责人"); + + private String code; + private String value; + + MeterRoleTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java index 1bd5a6f..62ed945 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; +import com.casic.missiles.dto.meter.StaffCertificateResponse; import com.casic.missiles.model.MeterStaff; import org.apache.ibatis.annotations.Param; @@ -27,4 +28,6 @@ MeterStaff selectStaffInfo(@Param("id")String id); void addStaffList(@Param("list") List list); + + List meterStaffStatistic(); } diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml index 6a46132..0c4a29d 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml @@ -6,7 +6,7 @@ INSERT INTO meter_certificate_expire_message ( `id`, `staff_id`, `certificate_id`, `staff_no`, `certificate_no`, `certificate_name`, `valid_date`, `status` ) VALUES - (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},#{bean.validDate},0) + (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'),,0) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml index 83470e4..383646a 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml @@ -8,8 +8,8 @@ VALUES (#{bean.certificateId}, #{bean.id}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) @@ -19,8 +19,8 @@ VALUES (#{bean.id}, #{bean.staffNo}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml index 346076e..81101aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml @@ -25,8 +25,8 @@ VALUES (#{bean.id}, #{bean.name}, #{bean.idCard}, #{bean.account}, #{bean.staffNo} - , #{bean.sex}, DATE_FORMAT(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} - , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, DATE_FORMAT(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} + , #{bean.sex}, STR_TO_DATE(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} + , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, STR_TO_DATE(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} , #{bean.mainExaminer}, #{bean.specialOperator}, #{bean.remark} ) @@ -94,7 +94,21 @@ meter_staff t where t.id =#{id} - + SELECT + DATE_FORMAT( work_date, '%Y-%m' ) AS `date`, + COUNT( 1 ) AS `count` + FROM + meter_staff + WHERE + is_del = 0 + GROUP BY + DATE_FORMAT( work_date, '%Y-%m' ) + ORDER BY + DATE_FORMAT( work_date, '%Y-%m' ) + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java new file mode 100644 index 0000000..d6d8e9e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java @@ -0,0 +1,20 @@ +package com.casic.missiles.dto.meter; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 工作台请求参数 + */ +@ApiModel +@Data +public class MeterWorkbenchRequest { + + /** + * 登录账号 + */ + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java new file mode 100644 index 0000000..def918d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.controller; + + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.service.MeterWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作台相关接口") +@RestController +@RequestMapping("/workbench") +public class MeterWorkbenchController { + + @Resource + private MeterWorkbenchService meterWorkbenchService; + + /** + * 证书列表查询 + * @return + */ + @ApiOperation("我的证书列表查询") + @PostMapping("/queryStaffCertificate") + @ResponseBody + public ReturnDTO queryStaffCertificate(@RequestBody MeterWorkbenchRequest workbenchRequest) { + return meterWorkbenchService.queryStaffCertificate(workbenchRequest); + } + + /** + * 计量人员统计 + * @return + */ + @ApiOperation("计量人员统计") + @PostMapping("/meterStaffStatistic") + @ResponseBody + public ReturnDTO meterStaffStatistic() { + return meterWorkbenchService.meterStaffStatistic(); + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java new file mode 100644 index 0000000..2fa740b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums; + +public enum MeterRoleTypeEnum { + + METER_DEPT_ADMIN("2", "计量部门负责人"); + + private String code; + private String value; + + MeterRoleTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java index 1bd5a6f..62ed945 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; +import com.casic.missiles.dto.meter.StaffCertificateResponse; import com.casic.missiles.model.MeterStaff; import org.apache.ibatis.annotations.Param; @@ -27,4 +28,6 @@ MeterStaff selectStaffInfo(@Param("id")String id); void addStaffList(@Param("list") List list); + + List meterStaffStatistic(); } diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml index 6a46132..0c4a29d 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml @@ -6,7 +6,7 @@ INSERT INTO meter_certificate_expire_message ( `id`, `staff_id`, `certificate_id`, `staff_no`, `certificate_no`, `certificate_name`, `valid_date`, `status` ) VALUES - (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},#{bean.validDate},0) + (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'),,0) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml index 83470e4..383646a 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml @@ -8,8 +8,8 @@ VALUES (#{bean.certificateId}, #{bean.id}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) @@ -19,8 +19,8 @@ VALUES (#{bean.id}, #{bean.staffNo}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml index 346076e..81101aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml @@ -25,8 +25,8 @@ VALUES (#{bean.id}, #{bean.name}, #{bean.idCard}, #{bean.account}, #{bean.staffNo} - , #{bean.sex}, DATE_FORMAT(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} - , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, DATE_FORMAT(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} + , #{bean.sex}, STR_TO_DATE(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} + , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, STR_TO_DATE(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} , #{bean.mainExaminer}, #{bean.specialOperator}, #{bean.remark} ) @@ -94,7 +94,21 @@ meter_staff t where t.id =#{id} - + SELECT + DATE_FORMAT( work_date, '%Y-%m' ) AS `date`, + COUNT( 1 ) AS `count` + FROM + meter_staff + WHERE + is_del = 0 + GROUP BY + DATE_FORMAT( work_date, '%Y-%m' ) + ORDER BY + DATE_FORMAT( work_date, '%Y-%m' ) + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java new file mode 100644 index 0000000..d6d8e9e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java @@ -0,0 +1,20 @@ +package com.casic.missiles.dto.meter; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 工作台请求参数 + */ +@ApiModel +@Data +public class MeterWorkbenchRequest { + + /** + * 登录账号 + */ + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java new file mode 100644 index 0000000..cbaefd9 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java @@ -0,0 +1,54 @@ +package com.casic.missiles.dto.meter; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *工作台我的证书响应实体 + */ + +@ApiModel +@Data +public class StaffCertificateResponse { + + /** + * 证书名称 + */ + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + + /** + * 人员名称 + */ + @ApiModelProperty(value = "人员名称", dataType = "String") + private String name; + + /** + * 到期时间 + */ + @ApiModelProperty(value = "到期时间", dataType = "String") + private String validDate; + + /** + * 最近到期时间 + */ + @ApiModelProperty(value = "最近到期时间", dataType = "Integer") + private Integer lastValidDate; + + /** + * 时间 + */ + @ApiModelProperty(value = "时间", dataType = "String") + private String date; + + /** + * 人数 + */ + @ApiModelProperty(value = "人数", dataType = "String") + private String count; + + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java new file mode 100644 index 0000000..def918d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.controller; + + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.service.MeterWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作台相关接口") +@RestController +@RequestMapping("/workbench") +public class MeterWorkbenchController { + + @Resource + private MeterWorkbenchService meterWorkbenchService; + + /** + * 证书列表查询 + * @return + */ + @ApiOperation("我的证书列表查询") + @PostMapping("/queryStaffCertificate") + @ResponseBody + public ReturnDTO queryStaffCertificate(@RequestBody MeterWorkbenchRequest workbenchRequest) { + return meterWorkbenchService.queryStaffCertificate(workbenchRequest); + } + + /** + * 计量人员统计 + * @return + */ + @ApiOperation("计量人员统计") + @PostMapping("/meterStaffStatistic") + @ResponseBody + public ReturnDTO meterStaffStatistic() { + return meterWorkbenchService.meterStaffStatistic(); + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java new file mode 100644 index 0000000..2fa740b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums; + +public enum MeterRoleTypeEnum { + + METER_DEPT_ADMIN("2", "计量部门负责人"); + + private String code; + private String value; + + MeterRoleTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java index 1bd5a6f..62ed945 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; +import com.casic.missiles.dto.meter.StaffCertificateResponse; import com.casic.missiles.model.MeterStaff; import org.apache.ibatis.annotations.Param; @@ -27,4 +28,6 @@ MeterStaff selectStaffInfo(@Param("id")String id); void addStaffList(@Param("list") List list); + + List meterStaffStatistic(); } diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml index 6a46132..0c4a29d 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml @@ -6,7 +6,7 @@ INSERT INTO meter_certificate_expire_message ( `id`, `staff_id`, `certificate_id`, `staff_no`, `certificate_no`, `certificate_name`, `valid_date`, `status` ) VALUES - (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},#{bean.validDate},0) + (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'),,0) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml index 83470e4..383646a 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml @@ -8,8 +8,8 @@ VALUES (#{bean.certificateId}, #{bean.id}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) @@ -19,8 +19,8 @@ VALUES (#{bean.id}, #{bean.staffNo}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml index 346076e..81101aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml @@ -25,8 +25,8 @@ VALUES (#{bean.id}, #{bean.name}, #{bean.idCard}, #{bean.account}, #{bean.staffNo} - , #{bean.sex}, DATE_FORMAT(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} - , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, DATE_FORMAT(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} + , #{bean.sex}, STR_TO_DATE(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} + , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, STR_TO_DATE(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} , #{bean.mainExaminer}, #{bean.specialOperator}, #{bean.remark} ) @@ -94,7 +94,21 @@ meter_staff t where t.id =#{id} - + SELECT + DATE_FORMAT( work_date, '%Y-%m' ) AS `date`, + COUNT( 1 ) AS `count` + FROM + meter_staff + WHERE + is_del = 0 + GROUP BY + DATE_FORMAT( work_date, '%Y-%m' ) + ORDER BY + DATE_FORMAT( work_date, '%Y-%m' ) + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java new file mode 100644 index 0000000..d6d8e9e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java @@ -0,0 +1,20 @@ +package com.casic.missiles.dto.meter; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 工作台请求参数 + */ +@ApiModel +@Data +public class MeterWorkbenchRequest { + + /** + * 登录账号 + */ + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java new file mode 100644 index 0000000..cbaefd9 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java @@ -0,0 +1,54 @@ +package com.casic.missiles.dto.meter; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *工作台我的证书响应实体 + */ + +@ApiModel +@Data +public class StaffCertificateResponse { + + /** + * 证书名称 + */ + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + + /** + * 人员名称 + */ + @ApiModelProperty(value = "人员名称", dataType = "String") + private String name; + + /** + * 到期时间 + */ + @ApiModelProperty(value = "到期时间", dataType = "String") + private String validDate; + + /** + * 最近到期时间 + */ + @ApiModelProperty(value = "最近到期时间", dataType = "Integer") + private Integer lastValidDate; + + /** + * 时间 + */ + @ApiModelProperty(value = "时间", dataType = "String") + private String date; + + /** + * 人数 + */ + @ApiModelProperty(value = "人数", dataType = "String") + private String count; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java index e212085..441a7c6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java @@ -243,9 +243,9 @@ bean.setAdministrationJob(administrationJobDictMap.get(bean.getAdministrationJob()).get(0).getCode()); bean.setDeptId(deptMap.get(bean.getDeptId()).get(0).getId()); bean.setSex(bean.getSex().equals("男")?"1":"0"); - bean.setSex(bean.getMainExaminer().equals("是")?"0":"1"); - bean.setSex(bean.getSpecialOperator().equals("是")?"0":"1"); - bean.setSex(bean.getTechnologyExam().equals("是")?"0":"1"); + bean.setMainExaminer(bean.getMainExaminer().equals("是")?"0":"1"); + bean.setSpecialOperator(bean.getSpecialOperator().equals("是")?"0":"1"); + bean.setTechnologyExam(bean.getTechnologyExam().equals("是")?"0":"1"); maxNo.getAndIncrement(); }); meterStaffMapper.addStaffList(list); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java new file mode 100644 index 0000000..def918d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.controller; + + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.service.MeterWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作台相关接口") +@RestController +@RequestMapping("/workbench") +public class MeterWorkbenchController { + + @Resource + private MeterWorkbenchService meterWorkbenchService; + + /** + * 证书列表查询 + * @return + */ + @ApiOperation("我的证书列表查询") + @PostMapping("/queryStaffCertificate") + @ResponseBody + public ReturnDTO queryStaffCertificate(@RequestBody MeterWorkbenchRequest workbenchRequest) { + return meterWorkbenchService.queryStaffCertificate(workbenchRequest); + } + + /** + * 计量人员统计 + * @return + */ + @ApiOperation("计量人员统计") + @PostMapping("/meterStaffStatistic") + @ResponseBody + public ReturnDTO meterStaffStatistic() { + return meterWorkbenchService.meterStaffStatistic(); + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java new file mode 100644 index 0000000..2fa740b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums; + +public enum MeterRoleTypeEnum { + + METER_DEPT_ADMIN("2", "计量部门负责人"); + + private String code; + private String value; + + MeterRoleTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java index 1bd5a6f..62ed945 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; +import com.casic.missiles.dto.meter.StaffCertificateResponse; import com.casic.missiles.model.MeterStaff; import org.apache.ibatis.annotations.Param; @@ -27,4 +28,6 @@ MeterStaff selectStaffInfo(@Param("id")String id); void addStaffList(@Param("list") List list); + + List meterStaffStatistic(); } diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml index 6a46132..0c4a29d 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml @@ -6,7 +6,7 @@ INSERT INTO meter_certificate_expire_message ( `id`, `staff_id`, `certificate_id`, `staff_no`, `certificate_no`, `certificate_name`, `valid_date`, `status` ) VALUES - (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},#{bean.validDate},0) + (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'),,0) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml index 83470e4..383646a 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml @@ -8,8 +8,8 @@ VALUES (#{bean.certificateId}, #{bean.id}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) @@ -19,8 +19,8 @@ VALUES (#{bean.id}, #{bean.staffNo}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml index 346076e..81101aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml @@ -25,8 +25,8 @@ VALUES (#{bean.id}, #{bean.name}, #{bean.idCard}, #{bean.account}, #{bean.staffNo} - , #{bean.sex}, DATE_FORMAT(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} - , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, DATE_FORMAT(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} + , #{bean.sex}, STR_TO_DATE(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} + , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, STR_TO_DATE(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} , #{bean.mainExaminer}, #{bean.specialOperator}, #{bean.remark} ) @@ -94,7 +94,21 @@ meter_staff t where t.id =#{id} - + SELECT + DATE_FORMAT( work_date, '%Y-%m' ) AS `date`, + COUNT( 1 ) AS `count` + FROM + meter_staff + WHERE + is_del = 0 + GROUP BY + DATE_FORMAT( work_date, '%Y-%m' ) + ORDER BY + DATE_FORMAT( work_date, '%Y-%m' ) + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java new file mode 100644 index 0000000..d6d8e9e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java @@ -0,0 +1,20 @@ +package com.casic.missiles.dto.meter; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 工作台请求参数 + */ +@ApiModel +@Data +public class MeterWorkbenchRequest { + + /** + * 登录账号 + */ + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java new file mode 100644 index 0000000..cbaefd9 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java @@ -0,0 +1,54 @@ +package com.casic.missiles.dto.meter; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *工作台我的证书响应实体 + */ + +@ApiModel +@Data +public class StaffCertificateResponse { + + /** + * 证书名称 + */ + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + + /** + * 人员名称 + */ + @ApiModelProperty(value = "人员名称", dataType = "String") + private String name; + + /** + * 到期时间 + */ + @ApiModelProperty(value = "到期时间", dataType = "String") + private String validDate; + + /** + * 最近到期时间 + */ + @ApiModelProperty(value = "最近到期时间", dataType = "Integer") + private Integer lastValidDate; + + /** + * 时间 + */ + @ApiModelProperty(value = "时间", dataType = "String") + private String date; + + /** + * 人数 + */ + @ApiModelProperty(value = "人数", dataType = "String") + private String count; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java index e212085..441a7c6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java @@ -243,9 +243,9 @@ bean.setAdministrationJob(administrationJobDictMap.get(bean.getAdministrationJob()).get(0).getCode()); bean.setDeptId(deptMap.get(bean.getDeptId()).get(0).getId()); bean.setSex(bean.getSex().equals("男")?"1":"0"); - bean.setSex(bean.getMainExaminer().equals("是")?"0":"1"); - bean.setSex(bean.getSpecialOperator().equals("是")?"0":"1"); - bean.setSex(bean.getTechnologyExam().equals("是")?"0":"1"); + bean.setMainExaminer(bean.getMainExaminer().equals("是")?"0":"1"); + bean.setSpecialOperator(bean.getSpecialOperator().equals("是")?"0":"1"); + bean.setTechnologyExam(bean.getTechnologyExam().equals("是")?"0":"1"); maxNo.getAndIncrement(); }); meterStaffMapper.addStaffList(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterWorkbenchServiceImpl.java new file mode 100644 index 0000000..b606644 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterWorkbenchServiceImpl.java @@ -0,0 +1,101 @@ +package com.casic.missiles.service.Impl; + + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.dto.MeterCertificateDto; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.meter.MeterStaffRequest; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.dto.meter.StaffCertificateResponse; +import com.casic.missiles.enums.MeterRoleTypeEnum; +import com.casic.missiles.mapper.MeterCertificateMapper; +import com.casic.missiles.mapper.MeterStaffMapper; +import com.casic.missiles.mapper.UserInfoMapper; +import com.casic.missiles.model.MeterCertificate; +import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.UserInfo; +import com.casic.missiles.modular.system.dao.RuRelationMapper; +import com.casic.missiles.modular.system.dao.UserMapper; +import com.casic.missiles.modular.system.model.RuRelation; +import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.service.MeterWorkbenchService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +@Service("MeterWorkbenchService") +public class MeterWorkbenchServiceImpl implements MeterWorkbenchService { + + @Resource + private MeterStaffMapper meterStaffMapper; + + @Resource + private MeterCertificateMapper meterCertificateMapper; + + @Resource + private UserMapper userMapper; + + @Resource + private RuRelationMapper ruRelationMapper; + + + + @Override + public ReturnDTO queryStaffCertificate(MeterWorkbenchRequest workbenchRequest) { + List resList = new ArrayList<>(); + QueryWrapper staffWrapper = new QueryWrapper<>(); + QueryWrapper certificateWrapper = new QueryWrapper<>(); + QueryWrapper userWrapper = new QueryWrapper<>(); + // 通过当前登录账号获取userId 6.7.2.0 + userWrapper.eq("account",workbenchRequest.getAccount()); + User user = userMapper.selectOne(userWrapper); + // 通过userID和计量部门负责人角色id判断当前登录用户是否为负责人 + QueryWrapper ruRelationWrapper = new QueryWrapper<>(); + ruRelationWrapper.eq("userid",user.getId()); + ruRelationWrapper.eq("roleid", MeterRoleTypeEnum.METER_DEPT_ADMIN.getCode()); + RuRelation ruRelation = ruRelationMapper.selectOne(ruRelationWrapper); + if(ObjectUtil.isNotEmpty(ruRelation)){ + // 当前用户是计量部门负责人查询所有证书信息 + List certificateList = meterCertificateMapper.queryCertificateList(new MeterStaffRequest()); + certificateList.forEach(bean->{ + StaffCertificateResponse certificateResponse = new StaffCertificateResponse(); + BeanUtils.copyProperties(bean, certificateResponse); + resList.add(certificateResponse); + }); + }else{ + // 当前用户不是计量部门负责人查询当前用户的证书信息 + // 通过登录账号获取计量人员信息 + staffWrapper.eq("account",workbenchRequest.getAccount()); + MeterStaff meterStaff = meterStaffMapper.selectOne(staffWrapper); + // 通过计量人员信息id对应证书 + certificateWrapper.eq("staff_id",meterStaff.getId()); + certificateWrapper.orderByAsc("create_time"); + List certificateList = meterCertificateMapper.selectList(certificateWrapper); + certificateList.forEach(bean->{ + StaffCertificateResponse certificateResponse = new StaffCertificateResponse(); + BeanUtils.copyProperties(bean, certificateResponse); + // 判断证书过期时间于当前时间差多少天 + int days = (int) ((DateUtil.parseDate(bean.getValidDate()).getTime() - DateUtil.parseDate(DateUtil.formatDate(new Date())).getTime()) / (1000*3600*24)); + if(days>0){ + certificateResponse.setLastValidDate(days); + } + resList.add(certificateResponse); + }); + } + return ReturnUtil.success(resList); + } + + @Override + public ReturnDTO meterStaffStatistic() { + List resList = meterStaffMapper.meterStaffStatistic(); + return ReturnUtil.success(resList); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java index 55abc84..d5d5298 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterStaffController.java @@ -1,8 +1,6 @@ package com.casic.missiles.controller; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; @@ -17,17 +15,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.util.http.fileupload.FileItem; -import org.apache.tomcat.util.http.fileupload.FileItemFactory; -import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java new file mode 100644 index 0000000..def918d --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MeterWorkbenchController.java @@ -0,0 +1,43 @@ +package com.casic.missiles.controller; + + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.service.MeterWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作台相关接口") +@RestController +@RequestMapping("/workbench") +public class MeterWorkbenchController { + + @Resource + private MeterWorkbenchService meterWorkbenchService; + + /** + * 证书列表查询 + * @return + */ + @ApiOperation("我的证书列表查询") + @PostMapping("/queryStaffCertificate") + @ResponseBody + public ReturnDTO queryStaffCertificate(@RequestBody MeterWorkbenchRequest workbenchRequest) { + return meterWorkbenchService.queryStaffCertificate(workbenchRequest); + } + + /** + * 计量人员统计 + * @return + */ + @ApiOperation("计量人员统计") + @PostMapping("/meterStaffStatistic") + @ResponseBody + public ReturnDTO meterStaffStatistic() { + return meterWorkbenchService.meterStaffStatistic(); + } + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java new file mode 100644 index 0000000..2fa740b --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums; + +public enum MeterRoleTypeEnum { + + METER_DEPT_ADMIN("2", "计量部门负责人"); + + private String code; + private String value; + + MeterRoleTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java index 1bd5a6f..62ed945 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterStaffMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; +import com.casic.missiles.dto.meter.StaffCertificateResponse; import com.casic.missiles.model.MeterStaff; import org.apache.ibatis.annotations.Param; @@ -27,4 +28,6 @@ MeterStaff selectStaffInfo(@Param("id")String id); void addStaffList(@Param("list") List list); + + List meterStaffStatistic(); } diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml index 6a46132..0c4a29d 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateExpireMessageMapper.xml @@ -6,7 +6,7 @@ INSERT INTO meter_certificate_expire_message ( `id`, `staff_id`, `certificate_id`, `staff_no`, `certificate_no`, `certificate_name`, `valid_date`, `status` ) VALUES - (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},#{bean.validDate},0) + (#{bean.id},#{bean.staffId},#{bean.certificateId},#{bean.staffNo},#{bean.certificateNo},#{bean.certificateName},STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'),,0) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml index 83470e4..383646a 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterCertificateMapper.xml @@ -8,8 +8,8 @@ VALUES (#{bean.certificateId}, #{bean.id}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) @@ -19,8 +19,8 @@ VALUES (#{bean.id}, #{bean.staffNo}, #{bean.certificateNo}, #{bean.certificateName}, - DATE_FORMAT(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, - DATE_FORMAT(#{bean.validDate},'%Y-%m-%d'), + STR_TO_DATE(#{bean.certificateDate},'%Y-%m-%d'), #{bean.certificateCompany}, + STR_TO_DATE(#{bean.validDate},'%Y-%m-%d'), ) diff --git a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml index 346076e..81101aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/MeterStaffMapper.xml @@ -25,8 +25,8 @@ VALUES (#{bean.id}, #{bean.name}, #{bean.idCard}, #{bean.account}, #{bean.staffNo} - , #{bean.sex}, DATE_FORMAT(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} - , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, DATE_FORMAT(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} + , #{bean.sex}, STR_TO_DATE(#{bean.birthday},'%Y-%m-%d'), #{bean.education}, #{bean.technologyJob} + , #{bean.administrationJob}, #{bean.deptId}, #{bean.major}, STR_TO_DATE(#{bean.workDate},'%Y-%m-%d'), #{bean.technologyExam} , #{bean.mainExaminer}, #{bean.specialOperator}, #{bean.remark} ) @@ -94,7 +94,21 @@ meter_staff t where t.id =#{id} - + SELECT + DATE_FORMAT( work_date, '%Y-%m' ) AS `date`, + COUNT( 1 ) AS `count` + FROM + meter_staff + WHERE + is_del = 0 + GROUP BY + DATE_FORMAT( work_date, '%Y-%m' ) + ORDER BY + DATE_FORMAT( work_date, '%Y-%m' ) + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java new file mode 100644 index 0000000..d6d8e9e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterWorkbenchRequest.java @@ -0,0 +1,20 @@ +package com.casic.missiles.dto.meter; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 工作台请求参数 + */ +@ApiModel +@Data +public class MeterWorkbenchRequest { + + /** + * 登录账号 + */ + @ApiModelProperty(value = "登录账号", dataType = "String") + private String account; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java new file mode 100644 index 0000000..cbaefd9 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StaffCertificateResponse.java @@ -0,0 +1,54 @@ +package com.casic.missiles.dto.meter; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *工作台我的证书响应实体 + */ + +@ApiModel +@Data +public class StaffCertificateResponse { + + /** + * 证书名称 + */ + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificateName; + + + /** + * 人员名称 + */ + @ApiModelProperty(value = "人员名称", dataType = "String") + private String name; + + /** + * 到期时间 + */ + @ApiModelProperty(value = "到期时间", dataType = "String") + private String validDate; + + /** + * 最近到期时间 + */ + @ApiModelProperty(value = "最近到期时间", dataType = "Integer") + private Integer lastValidDate; + + /** + * 时间 + */ + @ApiModelProperty(value = "时间", dataType = "String") + private String date; + + /** + * 人数 + */ + @ApiModelProperty(value = "人数", dataType = "String") + private String count; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java index e212085..441a7c6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterStaffServiceImpl.java @@ -243,9 +243,9 @@ bean.setAdministrationJob(administrationJobDictMap.get(bean.getAdministrationJob()).get(0).getCode()); bean.setDeptId(deptMap.get(bean.getDeptId()).get(0).getId()); bean.setSex(bean.getSex().equals("男")?"1":"0"); - bean.setSex(bean.getMainExaminer().equals("是")?"0":"1"); - bean.setSex(bean.getSpecialOperator().equals("是")?"0":"1"); - bean.setSex(bean.getTechnologyExam().equals("是")?"0":"1"); + bean.setMainExaminer(bean.getMainExaminer().equals("是")?"0":"1"); + bean.setSpecialOperator(bean.getSpecialOperator().equals("是")?"0":"1"); + bean.setTechnologyExam(bean.getTechnologyExam().equals("是")?"0":"1"); maxNo.getAndIncrement(); }); meterStaffMapper.addStaffList(list); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterWorkbenchServiceImpl.java new file mode 100644 index 0000000..b606644 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/MeterWorkbenchServiceImpl.java @@ -0,0 +1,101 @@ +package com.casic.missiles.service.Impl; + + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.dto.MeterCertificateDto; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.meter.MeterStaffRequest; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; +import com.casic.missiles.dto.meter.StaffCertificateResponse; +import com.casic.missiles.enums.MeterRoleTypeEnum; +import com.casic.missiles.mapper.MeterCertificateMapper; +import com.casic.missiles.mapper.MeterStaffMapper; +import com.casic.missiles.mapper.UserInfoMapper; +import com.casic.missiles.model.MeterCertificate; +import com.casic.missiles.model.MeterStaff; +import com.casic.missiles.model.UserInfo; +import com.casic.missiles.modular.system.dao.RuRelationMapper; +import com.casic.missiles.modular.system.dao.UserMapper; +import com.casic.missiles.modular.system.model.RuRelation; +import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.service.MeterWorkbenchService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +@Service("MeterWorkbenchService") +public class MeterWorkbenchServiceImpl implements MeterWorkbenchService { + + @Resource + private MeterStaffMapper meterStaffMapper; + + @Resource + private MeterCertificateMapper meterCertificateMapper; + + @Resource + private UserMapper userMapper; + + @Resource + private RuRelationMapper ruRelationMapper; + + + + @Override + public ReturnDTO queryStaffCertificate(MeterWorkbenchRequest workbenchRequest) { + List resList = new ArrayList<>(); + QueryWrapper staffWrapper = new QueryWrapper<>(); + QueryWrapper certificateWrapper = new QueryWrapper<>(); + QueryWrapper userWrapper = new QueryWrapper<>(); + // 通过当前登录账号获取userId 6.7.2.0 + userWrapper.eq("account",workbenchRequest.getAccount()); + User user = userMapper.selectOne(userWrapper); + // 通过userID和计量部门负责人角色id判断当前登录用户是否为负责人 + QueryWrapper ruRelationWrapper = new QueryWrapper<>(); + ruRelationWrapper.eq("userid",user.getId()); + ruRelationWrapper.eq("roleid", MeterRoleTypeEnum.METER_DEPT_ADMIN.getCode()); + RuRelation ruRelation = ruRelationMapper.selectOne(ruRelationWrapper); + if(ObjectUtil.isNotEmpty(ruRelation)){ + // 当前用户是计量部门负责人查询所有证书信息 + List certificateList = meterCertificateMapper.queryCertificateList(new MeterStaffRequest()); + certificateList.forEach(bean->{ + StaffCertificateResponse certificateResponse = new StaffCertificateResponse(); + BeanUtils.copyProperties(bean, certificateResponse); + resList.add(certificateResponse); + }); + }else{ + // 当前用户不是计量部门负责人查询当前用户的证书信息 + // 通过登录账号获取计量人员信息 + staffWrapper.eq("account",workbenchRequest.getAccount()); + MeterStaff meterStaff = meterStaffMapper.selectOne(staffWrapper); + // 通过计量人员信息id对应证书 + certificateWrapper.eq("staff_id",meterStaff.getId()); + certificateWrapper.orderByAsc("create_time"); + List certificateList = meterCertificateMapper.selectList(certificateWrapper); + certificateList.forEach(bean->{ + StaffCertificateResponse certificateResponse = new StaffCertificateResponse(); + BeanUtils.copyProperties(bean, certificateResponse); + // 判断证书过期时间于当前时间差多少天 + int days = (int) ((DateUtil.parseDate(bean.getValidDate()).getTime() - DateUtil.parseDate(DateUtil.formatDate(new Date())).getTime()) / (1000*3600*24)); + if(days>0){ + certificateResponse.setLastValidDate(days); + } + resList.add(certificateResponse); + }); + } + return ReturnUtil.success(resList); + } + + @Override + public ReturnDTO meterStaffStatistic() { + List resList = meterStaffMapper.meterStaffStatistic(); + return ReturnUtil.success(resList); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/MeterWorkbenchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/MeterWorkbenchService.java new file mode 100644 index 0000000..c04b03a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/MeterWorkbenchService.java @@ -0,0 +1,11 @@ +package com.casic.missiles.service; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.meter.MeterWorkbenchRequest; + +public interface MeterWorkbenchService { + + ReturnDTO queryStaffCertificate(MeterWorkbenchRequest workbenchRequest); + + ReturnDTO meterStaffStatistic(); +}