From 0d65839d27a8384bcafe5f2ed573bfd32b4cc1e9 Mon Sep 17 00:00:00 2001 From: yanshikui Date: Thu, 26 Dec 2024 11:15:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++ .../dv/controller/DvMachineryController.java | 10 ++++- .../dv/service/impl/DvSubjectServiceImpl.java | 18 ++++---- .../controller/MdUnitMeasureController.java | 9 +++- .../mes/md/mapper/MdUnitMeasureMapper.java | 23 ++++++---- .../mes/md/service/IMdUnitMeasureService.java | 23 ++++++---- .../impl/MdUnitMeasureServiceImpl.java | 27 ++++++++--- .../mapper/md/MdUnitMeasureMapper.xml | 15 ++++--- .../resources/mapper/system/SysDeptMapper.xml | 36 +++++++-------- .../resources/mapper/system/SysPostMapper.xml | 31 ++++++------- .../resources/mapper/system/SysRoleMapper.xml | 38 ++++++++-------- .../resources/mapper/system/SysUserMapper.xml | 45 ++++++++++--------- 12 files changed, 165 insertions(+), 113 deletions(-) diff --git a/.gitignore b/.gitignore index 6f8c5ec..da948b1 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,6 @@ nbdist/ !*/build/*.xml application-druid.yml application-pro.yml +#忽略所有target目录 +target/ +.vscode diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvMachineryController.java b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvMachineryController.java index d0f2a10..9e10b6b 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvMachineryController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvMachineryController.java @@ -4,6 +4,7 @@ import com.ktg.common.annotation.Log; import com.ktg.common.constant.UserConstants; import com.ktg.common.core.controller.BaseController; import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.core.domain.entity.SysUser; import com.ktg.common.core.page.TableDataInfo; import com.ktg.common.enums.BusinessType; import com.ktg.common.utils.SecurityUtils; @@ -21,7 +22,7 @@ import java.util.List; /** * 设备Controller - * + * * @author yinjinlu * @date 2022-05-08 */ @@ -117,4 +118,11 @@ public class DvMachineryController extends BaseController return AjaxResult.success(message); } + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) + { + ExcelUtil util = new ExcelUtil(DvMachinery.class); + util.importTemplateExcel(response, "设备台账"); + } + } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvSubjectServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvSubjectServiceImpl.java index b449892..8aba363 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvSubjectServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvSubjectServiceImpl.java @@ -13,19 +13,19 @@ import com.ktg.mes.dv.service.IDvSubjectService; /** * 设备点检保养项目Service业务层处理 - * + * * @author yinjinlu * @date 2022-06-16 */ @Service -public class DvSubjectServiceImpl implements IDvSubjectService +public class DvSubjectServiceImpl implements IDvSubjectService { @Autowired private DvSubjectMapper dvSubjectMapper; /** * 查询设备点检保养项目 - * + * * @param subjectId 设备点检保养项目主键 * @return 设备点检保养项目 */ @@ -37,7 +37,7 @@ public class DvSubjectServiceImpl implements IDvSubjectService /** * 查询设备点检保养项目列表 - * + * * @param dvSubject 设备点检保养项目 * @return 设备点检保养项目 */ @@ -51,7 +51,7 @@ public class DvSubjectServiceImpl implements IDvSubjectService public String checkSubjectCodeUnique(DvSubject dvSubject) { DvSubject subject = dvSubjectMapper.checkSubjectCodeUnique(dvSubject); Long subjectId = dvSubject.getSubjectId()==null?-1L:dvSubject.getSubjectId(); - if(StringUtils.isNotNull(subject) && subject.getSubjectId().longValue() == subjectId.longValue()){ + if(StringUtils.isNotNull(subject) && subject.getSubjectId().longValue() != subjectId.longValue()){ return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -59,7 +59,7 @@ public class DvSubjectServiceImpl implements IDvSubjectService /** * 新增设备点检保养项目 - * + * * @param dvSubject 设备点检保养项目 * @return 结果 */ @@ -72,7 +72,7 @@ public class DvSubjectServiceImpl implements IDvSubjectService /** * 修改设备点检保养项目 - * + * * @param dvSubject 设备点检保养项目 * @return 结果 */ @@ -85,7 +85,7 @@ public class DvSubjectServiceImpl implements IDvSubjectService /** * 批量删除设备点检保养项目 - * + * * @param subjectIds 需要删除的设备点检保养项目主键 * @return 结果 */ @@ -97,7 +97,7 @@ public class DvSubjectServiceImpl implements IDvSubjectService /** * 删除设备点检保养项目信息 - * + * * @param subjectId 设备点检保养项目主键 * @return 结果 */ diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdUnitMeasureController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdUnitMeasureController.java index 74a75a3..45a3999 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdUnitMeasureController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdUnitMeasureController.java @@ -1,5 +1,6 @@ package com.ktg.mes.md.controller; +import com.ktg.common.constant.UserConstants; import com.ktg.mes.md.service.IMdUnitMeasureService; import com.ktg.common.annotation.Log; import com.ktg.common.core.controller.BaseController; @@ -17,7 +18,7 @@ import java.util.List; /** * 单位Controller - * + * * @author ruoyi * @date 2022-04-27 */ @@ -86,6 +87,9 @@ public class MdUnitMeasureController extends BaseController @PostMapping public AjaxResult add(@RequestBody MdUnitMeasure mdUnitMeasure) { + if(UserConstants.NOT_UNIQUE.equals(mdUnitMeasureService.checkMeasureUnitCodeUnique(mdUnitMeasure))){ + return AjaxResult.error("单位编码已存在！"); + } return toAjax(mdUnitMeasureService.insertMdUnitMeasure(mdUnitMeasure)); } @@ -97,6 +101,9 @@ public class MdUnitMeasureController extends BaseController @PutMapping public AjaxResult edit(@RequestBody MdUnitMeasure mdUnitMeasure) { + if(UserConstants.NOT_UNIQUE.equals(mdUnitMeasureService.checkMeasureUnitCodeUnique(mdUnitMeasure))){ + return AjaxResult.error("单位编码已存在！"); + } return toAjax(mdUnitMeasureService.updateMdUnitMeasure(mdUnitMeasure)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdUnitMeasureMapper.java b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdUnitMeasureMapper.java index 1952d4e..a882bf3 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdUnitMeasureMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdUnitMeasureMapper.java @@ -6,23 +6,30 @@ import java.util.List; /** * 单位Mapper接口 - * + * * @author ruoyi * @date 2022-04-27 */ -public interface MdUnitMeasureMapper +public interface MdUnitMeasureMapper { /** * 查询单位 - * + * * @param measureId 单位主键 * @return 单位 */ public MdUnitMeasure selectMdUnitMeasureByMeasureId(Long measureId); + /** + * 计量单位唯一校验 + * + * @param mdUnitMeasure 单位主键 + * @return 单位 + */ + public MdUnitMeasure checkMeasureUnitCodeUnique(MdUnitMeasure mdUnitMeasure); /** * 查询单位列表 - * + * * @param mdUnitMeasure 单位 * @return 单位集合 */ @@ -32,7 +39,7 @@ public interface MdUnitMeasureMapper /** * 新增单位 - * + * * @param mdUnitMeasure 单位 * @return 结果 */ @@ -40,7 +47,7 @@ public interface MdUnitMeasureMapper /** * 修改单位 - * + * * @param mdUnitMeasure 单位 * @return 结果 */ @@ -48,7 +55,7 @@ public interface MdUnitMeasureMapper /** * 删除单位 - * + * * @param measureId 单位主键 * @return 结果 */ @@ -56,7 +63,7 @@ public interface MdUnitMeasureMapper /** * 批量删除单位 - * + * * @param measureIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdUnitMeasureService.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdUnitMeasureService.java index 2747cd5..d1e25df 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdUnitMeasureService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdUnitMeasureService.java @@ -6,23 +6,30 @@ import java.util.List; /** * 单位Service接口 - * + * * @author ruoyi * @date 2022-04-27 */ -public interface IMdUnitMeasureService +public interface IMdUnitMeasureService { /** * 查询单位 - * + * * @param measureId 单位主键 * @return 单位 */ public MdUnitMeasure selectMdUnitMeasureByMeasureId(Long measureId); + /** + * 计量单位唯一校验 + * + * @param mdUnitMeasure 单位主键 + * @return 单位 + */ + public String checkMeasureUnitCodeUnique(MdUnitMeasure mdUnitMeasure); /** * 查询单位列表 - * + * * @param mdUnitMeasure 单位 * @return 单位集合 */ @@ -37,7 +44,7 @@ public interface IMdUnitMeasureService /** * 新增单位 - * + * * @param mdUnitMeasure 单位 * @return 结果 */ @@ -45,7 +52,7 @@ public interface IMdUnitMeasureService /** * 修改单位 - * + * * @param mdUnitMeasure 单位 * @return 结果 */ @@ -53,7 +60,7 @@ public interface IMdUnitMeasureService /** * 批量删除单位 - * + * * @param measureIds 需要删除的单位主键集合 * @return 结果 */ @@ -61,7 +68,7 @@ public interface IMdUnitMeasureService /** * 删除单位信息 - * + * * @param measureId 单位主键 * @return 结果 */ diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdUnitMeasureServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdUnitMeasureServiceImpl.java index 85e307d..38279eb 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdUnitMeasureServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdUnitMeasureServiceImpl.java @@ -2,6 +2,9 @@ package com.ktg.mes.md.service.impl; import java.util.List; +import com.ktg.common.constant.UserConstants; +import com.ktg.common.utils.StringUtils; +import com.ktg.mes.md.domain.MdClient; import com.ktg.mes.md.service.IMdUnitMeasureService; import com.ktg.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -11,7 +14,7 @@ import com.ktg.mes.md.domain.MdUnitMeasure; /** * 单位Service业务层处理 - * + * * @author ruoyi * @date 2022-04-27 */ @@ -23,7 +26,7 @@ public class MdUnitMeasureServiceImpl implements IMdUnitMeasureService /** * 查询单位 - * + * * @param measureId 单位主键 * @return 单位 */ @@ -33,9 +36,19 @@ public class MdUnitMeasureServiceImpl implements IMdUnitMeasureService return mdUnitMeasureMapper.selectMdUnitMeasureByMeasureId(measureId); } + @Override + public String checkMeasureUnitCodeUnique(MdUnitMeasure mdUnitMeasure) { + MdUnitMeasure unitMeasure = mdUnitMeasureMapper.checkMeasureUnitCodeUnique(mdUnitMeasure); + Long subjectId = mdUnitMeasure.getMeasureId()==null?-1L:mdUnitMeasure.getMeasureId(); + if(StringUtils.isNotNull(unitMeasure)&& unitMeasure.getMeasureId().longValue() != subjectId.longValue()){ + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + /** * 查询单位列表 - * + * * @param mdUnitMeasure 单位 * @return 单位 */ @@ -52,7 +65,7 @@ public class MdUnitMeasureServiceImpl implements IMdUnitMeasureService /** * 新增单位 - * + * * @param mdUnitMeasure 单位 * @return 结果 */ @@ -65,7 +78,7 @@ public class MdUnitMeasureServiceImpl implements IMdUnitMeasureService /** * 修改单位 - * + * * @param mdUnitMeasure 单位 * @return 结果 */ @@ -78,7 +91,7 @@ public class MdUnitMeasureServiceImpl implements IMdUnitMeasureService /** * 批量删除单位 - * + * * @param measureIds 需要删除的单位主键 * @return 结果 */ @@ -90,7 +103,7 @@ public class MdUnitMeasureServiceImpl implements IMdUnitMeasureService /** * 删除单位信息 - * + * * @param measureId 单位主键 * @return 结果 */ diff --git a/ktg-mes/src/main/resources/mapper/md/MdUnitMeasureMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdUnitMeasureMapper.xml index eace785..781bdbc 100644 --- a/ktg-mes/src/main/resources/mapper/md/MdUnitMeasureMapper.xml +++ b/ktg-mes/src/main/resources/mapper/md/MdUnitMeasureMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + where d.del_flag = '0' @@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} order by d.parent_id, d.order_num - + - + - + - + - + - + - + - + insert into sys_dept( dept_id, @@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + update sys_dept @@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_id = #{deptId} - + update sys_dept set ancestors = - + - update sys_dept set status = '0' where dept_id in + update sys_dept set status = '0' where dept_id in #{deptId} - + update sys_dept set del_flag = '2' where dept_id = #{deptId} - \ No newline at end of file + diff --git a/ktg-system/src/main/resources/mapper/system/SysPostMapper.xml b/ktg-system/src/main/resources/mapper/system/SysPostMapper.xml index ef25643..1c2623c 100644 --- a/ktg-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ktg-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -16,12 +16,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark + select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark from sys_post - + - + - + - + - + - + - + - + update sys_post @@ -85,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_id = #{postId} - + insert into sys_post( post_id, @@ -107,16 +108,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + delete from sys_post where post_id = #{postId} - + delete from sys_post where post_id in #{postId} - + - \ No newline at end of file + diff --git a/ktg-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ktg-system/src/main/resources/mapper/system/SysRoleMapper.xml index f0c6f97..6da7ec4 100644 --- a/ktg-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ktg-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -20,16 +20,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, - r.status, r.del_flag, r.create_time, r.remark + r.status, r.del_flag, r.create_time, r.remark from sys_role r left join sys_user_role ur on ur.role_id = r.role_id left join sys_user u on u.user_id = ur.user_id left join sys_dept d on u.dept_id = d.dept_id - + - + - + - + - + - + - + - + - + insert into sys_role( role_id, @@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + update sys_role @@ -137,16 +137,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where role_id = #{roleId} - + update sys_role set del_flag = '2' where role_id = #{roleId} - + update sys_role set del_flag = '2' where role_id in #{roleId} - + - - \ No newline at end of file + + diff --git a/ktg-system/src/main/resources/mapper/system/SysUserMapper.xml b/ktg-system/src/main/resources/mapper/system/SysUserMapper.xml index 4b010ae..2e3f37e 100644 --- a/ktg-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ktg-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -44,9 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id - + - + - + - + - + - + - + - + + @@ -180,7 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + update sys_user @@ -201,28 +202,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where user_id = #{userId} - + update sys_user set status = #{status} where user_id = #{userId} - + update sys_user set avatar = #{avatar} where user_name = #{userName} - + update sys_user set password = #{password} where user_name = #{userName} - + update sys_user set del_flag = '2' where user_id = #{userId} - + update sys_user set del_flag = '2' where user_id in #{userId} - + - - \ No newline at end of file + + From 2033b454aca653e83eb386edace2c3a65c1ec057 Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Thu, 26 Dec 2024 14:19:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E6=8E=92=E7=8F=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=94=9F=E6=88=90=E6=8E=92=E7=8F=AD=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F=E4=B9=9F?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ktg/mes/cal/service/impl/CalTeamshiftServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamshiftServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamshiftServiceImpl.java index d486e28..c5ec327 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamshiftServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamshiftServiceImpl.java @@ -134,7 +134,7 @@ public class CalTeamshiftServiceImpl implements ICalTeamshiftService CalPlanTeam p2 = new CalPlanTeam(); p2.setPlanId(plandId); List teams = calPlanTeamMapper.selectCalPlanTeamList(p2); - Long days = CalendarUtil.getDateDiff(plan.getStartDate(),plan.getEndDate()); + Long days = CalendarUtil.getDateDiff(plan.getStartDate(),plan.getEndDate()) + 1; int shiftIndex =0; Date nowDate =null;