From 8e0c4fa43ff424179971f67898ff1dc579ce9e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Wed, 30 Aug 2023 23:59:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectMaterialSealController.java | 70 +++++++++++++++ .../controller/ProjectMeasureController.java | 88 +++++++++++++++++++ .../controller/ProjectSpecialController.java | 87 ++++++++++++++++++ .../controller/WechatUserLoginController.java | 3 +- .../jh/project/domain/SurProjectMeasure.java | 18 ++++ .../impl/SurProjectMeasureServiceImpl.java | 4 +- .../SurProjectWorkSpecialServiceImpl.java | 6 +- .../project/SurProjectMeasureMapper.xml | 6 +- .../project/SurProjectWorkSpecialMapper.xml | 7 +- 9 files changed, 282 insertions(+), 7 deletions(-) create mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java create mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java create mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectSpecialController.java diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java new file mode 100644 index 00000000..bd5550f9 --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java @@ -0,0 +1,70 @@ +package com.ruoyi.web.project.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.yanzhu.jh.project.domain.SurProjectMaterialSeal; +import com.yanzhu.jh.project.service.ISurProjectMaterialSealService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @version : V1.0 + * @ClassName: ProjectMaterialSealController + * @Description: 项目材料封样 + * @Auther: JiangYuQi + * @Date: 2020/7/7 18:03 + */ +@RestController +@RequestMapping("/wechat/projectMaterialSeal") +public class ProjectMaterialSealController extends BaseController { + + @Autowired + private ISurProjectMaterialSealService surProjectMaterialSealService; + + /** + * 查询项目材料封样列表 + * @param surProjectMaterialSeal + * @return + */ + @GetMapping("/list") + public AjaxResult list(SurProjectMaterialSeal surProjectMaterialSeal){ + if(surProjectMaterialSeal.getDeptId()==0){ + surProjectMaterialSeal.setDeptId(null); + } + return success(surProjectMaterialSealService.selectSurProjectMaterialSealList(surProjectMaterialSeal)); + } + + /** + * 查询材料封样详情 + * @param id + * @return + */ + @GetMapping("/info") + public AjaxResult info(Long id){ + return success(surProjectMaterialSealService.selectSurProjectMaterialSealById(id)); + } + + /** + * 新增材料封样 + * @param surProjectMaterialSeal + * @return + */ + @PostMapping("/add") + @Log(title = "材料封样", businessType = BusinessType.INSERT) + public AjaxResult addTrain(@RequestBody SurProjectMaterialSeal surProjectMaterialSeal){ + return success(surProjectMaterialSealService.insertSurProjectMaterialSeal(surProjectMaterialSeal)); + } + + /** + * 删除材料封样 + */ + @Log(title = "材料封样", businessType = BusinessType.DELETE) + @GetMapping("/remove") + public AjaxResult remove(@RequestParam Long id) + { + return toAjax(surProjectMaterialSealService.deleteSurProjectMaterialSealById(id)); + } + +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java new file mode 100644 index 00000000..889071fe --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java @@ -0,0 +1,88 @@ +package com.ruoyi.web.project.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.enums.PublicStateEnum; +import com.ruoyi.system.service.ISysDictDataService; +import com.yanzhu.jh.project.domain.SurProjectMeasure; +import com.yanzhu.jh.project.service.ISurProjectMeasureService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @version : V1.0 + * @ClassName: ProjectMeasureController + * @Description: 项目实测实量 + * @Auther: JiangYuQi + * @Date: 2020/7/7 18:03 + */ +@RestController +@RequestMapping("/wechat/projectMeasure") +public class ProjectMeasureController extends BaseController { + + @Autowired + ISysDictDataService sysDictDataService; + + @Autowired + private ISurProjectMeasureService surProjectMeasureService; + + /** + * 查询项目实测实量列表 + * @param surProjectMeasure + * @return + */ + @GetMapping("/list") + public AjaxResult list(SurProjectMeasure surProjectMeasure){ + if(surProjectMeasure.getDeptId()==0){ + surProjectMeasure.setDeptId(null); + } + return success(surProjectMeasureService.selectSurProjectMeasureList(surProjectMeasure)); + } + + /** + * 查询实测实量详情 + * @param id + * @return + */ + @GetMapping("/info") + public AjaxResult info(Long id){ + return success(surProjectMeasureService.selectSurProjectMeasureById(id)); + } + + /** + * 新增实测实量 + * @param surProjectMeasure + * @return + */ + @PostMapping("/add") + @Log(title = "实测实量", businessType = BusinessType.INSERT) + public AjaxResult addTrain(@RequestBody SurProjectMeasure surProjectMeasure){ + return success(surProjectMeasureService.insertSurProjectMeasure(surProjectMeasure)); + } + + /** + * 删除实测实量 + */ + @Log(title = "实测实量", businessType = BusinessType.DELETE) + @GetMapping("/remove") + public AjaxResult remove(@RequestParam Long id) + { + return toAjax(surProjectMeasureService.deleteSurProjectMeasureById(id)); + } + + /** + * 查询特种人员类型 + * @return + */ + @GetMapping("/queryDictType") + public AjaxResult queryDictType(String type){ + SysDictData dictData = new SysDictData(); + dictData.setDictType(type); + dictData.setStatus(PublicStateEnum.OK.getCode()); + return success(sysDictDataService.selectDictDataList(dictData)); + } + +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectSpecialController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectSpecialController.java new file mode 100644 index 00000000..ca1cd0ca --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectSpecialController.java @@ -0,0 +1,87 @@ +package com.ruoyi.web.project.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.enums.PublicStateEnum; +import com.ruoyi.system.service.ISysDictDataService; +import com.yanzhu.jh.project.domain.SurProjectWorkSpecial; +import com.yanzhu.jh.project.service.ISurProjectWorkSpecialService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @version : V1.0 + * @ClassName: ProjectSpecialController + * @Description: 项目特种人员 + * @Auther: JiangYuQi + * @Date: 2020/7/7 18:03 + */ +@RestController +@RequestMapping("/wechat/projectSpecial") +public class ProjectSpecialController extends BaseController { + + @Autowired + ISysDictDataService sysDictDataService; + + @Autowired + private ISurProjectWorkSpecialService surProjectWorkSpecialService; + + /** + * 查询项目特种人员列表 + * @param surProjectWorkSpecial + * @return + */ + @GetMapping("/list") + public AjaxResult list(SurProjectWorkSpecial surProjectWorkSpecial){ + if(surProjectWorkSpecial.getDeptId()==0){ + surProjectWorkSpecial.setDeptId(null); + } + return success(surProjectWorkSpecialService.selectSurProjectWorkSpecialList(surProjectWorkSpecial)); + } + + /** + * 查询特种人员详情 + * @param id + * @return + */ + @GetMapping("/info") + public AjaxResult info(Long id){ + return success(surProjectWorkSpecialService.selectSurProjectWorkSpecialById(id)); + } + + /** + * 新增特种人员 + * @param surProjectWorkSpecial + * @return + */ + @PostMapping("/add") + @Log(title = "特种人员", businessType = BusinessType.INSERT) + public AjaxResult addTrain(@RequestBody SurProjectWorkSpecial surProjectWorkSpecial){ + return success(surProjectWorkSpecialService.insertSurProjectWorkSpecial(surProjectWorkSpecial)); + } + + /** + * 删除特种人员 + */ + @Log(title = "特种人员", businessType = BusinessType.DELETE) + @GetMapping("/remove") + public AjaxResult remove(@RequestParam Long id) + { + return toAjax(surProjectWorkSpecialService.deleteSurProjectWorkSpecialById(id)); + } + + /** + * 查询特种人员类型 + * @return + */ + @GetMapping("/querySpecialType") + public AjaxResult querySpecialType(){ + SysDictData dictData = new SysDictData(); + dictData.setDictType("project_special_type"); + dictData.setStatus(PublicStateEnum.OK.getCode()); + return success(sysDictDataService.selectDictDataList(dictData)); + } +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java index b2848487..1589b1fa 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java @@ -96,7 +96,8 @@ public class WechatUserLoginController extends BaseController { */ @GetMapping("/getOpenId") public AjaxResult getOpenId(String code,String appId){ - return success(wechatUserLoginService.getOpenId(code,appId)); + Map data = wechatUserLoginService.getOpenId(code,appId); + return success(data); } /** diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java index 6a0bcd8a..1c1986c1 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java @@ -87,6 +87,8 @@ public class SurProjectMeasure extends BaseEntity private String projectName; private String deptName; + private String measureTypeName; + private String measureInfoName; public void setId(Long id) { @@ -258,6 +260,22 @@ public class SurProjectMeasure extends BaseEntity this.deptName = deptName; } + public String getMeasureTypeName() { + return measureTypeName; + } + + public void setMeasureTypeName(String measureTypeName) { + this.measureTypeName = measureTypeName; + } + + public String getMeasureInfoName() { + return measureInfoName; + } + + public void setMeasureInfoName(String measureInfoName) { + this.measureInfoName = measureInfoName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java index 9ef15445..794d82bd 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java @@ -55,9 +55,11 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService @Override public int insertSurProjectMeasure(SurProjectMeasure surProjectMeasure) { + if(surProjectMeasure.getCreateBy()==null){ + surProjectMeasure.setCreateBy(SecurityUtils.getUsername()); + } surProjectMeasure.setMainImage(surProjectMeasure.getImageUrls().split(",")[0]); surProjectMeasure.setIsDel(PublicStateEnum.OK.getCode()); - surProjectMeasure.setCreateBy(SecurityUtils.getUsername()); surProjectMeasure.setCreateTime(DateUtils.getNowDate()); return surProjectMeasureMapper.insertSurProjectMeasure(surProjectMeasure); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkSpecialServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkSpecialServiceImpl.java index 94efd509..732454bf 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkSpecialServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkSpecialServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.file.FileUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -82,8 +83,9 @@ public class SurProjectWorkSpecialServiceImpl implements ISurProjectWorkSpecialS @Override public int insertSurProjectWorkSpecial(SurProjectWorkSpecial surProjectWorkSpecial) { - surProjectWorkSpecial.setCreateBy(SecurityUtils.getUsername()); - //surProjectWorkSpecial.setDeptId(SecurityUtils.getDeptId()); + if(surProjectWorkSpecial.getCreateBy()==null){ + surProjectWorkSpecial.setCreateBy(SecurityUtils.getUsername()); + } surProjectWorkSpecial.setCreateTime(DateUtils.getNowDate()); surProjectWorkSpecial.setCredentialType(FileUtils.getFileLastNameUpCase(surProjectWorkSpecial.getCredentialFile())); return surProjectWorkSpecialMapper.insertSurProjectWorkSpecial(surProjectWorkSpecial); diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml index fdcb26d9..6dfea275 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml @@ -29,12 +29,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select spm.id, spm.project_id, spm.dept_id, spm.main_image, spm.image_urls, spm.measure_type, spm.measure_position, spm.measure_info, spm.measure_time, spm.measure_point_position, spm.measure_result, spm.measure_files, spm.quality_user, spm.quality_user_name, spm.supervise_user, spm.supervise_user_name, spm.is_del, spm.create_by, spm.create_time, spm.update_by, spm.update_time, spm.remark, sp.projectName, sd.dept_name from sur_project_measure spm + select spm.id, spm.project_id, spm.dept_id, spm.main_image, spm.image_urls, spm.measure_type, sdd1.dict_label as measure_type_name, spm.measure_position, spm.measure_info, sdd2.dict_label as measure_info_name, spm.measure_time, spm.measure_point_position, spm.measure_result, spm.measure_files, spm.quality_user, spm.quality_user_name, spm.supervise_user, spm.supervise_user_name, spm.is_del, spm.create_by, spm.create_time, spm.update_by, spm.update_time, spm.remark, sp.projectName, sd.dept_name from sur_project_measure spm left join sur_project sp on spm.project_id = sp.id left join sys_dept sd on sd.dept_id = spm.dept_id + left join sys_dict_data sdd1 on sdd1.dict_type = 'project_measure_type' and sdd1.dict_value = spm.measure_type + left join sys_dict_data sdd2 on sdd2.dict_type = 'project_measure_info_type' and sdd2.dict_value = spm.measure_info @@ -175,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"