From 4d7775ecb9d52da2558cef3f19bd5fab1746afae Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 五月 2024 17:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java | 2
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java | 6
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineCtrl.java | 43 +++-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPlt/PltStationMapper.java | 6
pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml | 62 +++----
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsSv.java | 2
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java | 59 +++++-
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java | 51 ++++-
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRSv.java | 2
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURCtrl.java | 54 ++++--
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java | 4
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltStation.java | 9 +
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java | 50 ++++-
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/privilege/PrivilegeCtrl.java | 4
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java | 10 +
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java | 67 ++++++--
pms-parent/pms-global/src/main/resources/privileges-config.xml | 30 ++-
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java | 14
18 files changed, 324 insertions(+), 151 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPlt/PltStationMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPlt/PltStationMapper.java
index 4e28a65..de60f68 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPlt/PltStationMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPlt/PltStationMapper.java
@@ -15,10 +15,6 @@
@Mapper
public interface PltStationMapper {
- int deleteByPrimaryKey(Long id);
-
- int insert(PltStation record);
-
int insertSelective(PltStation record);
PltStation selectByPrimaryKey(Long id);
@@ -26,8 +22,6 @@
long selectByCodeId(Long id,String code);
int updateByPrimaryKeySelective(PltStation record);
-
- int updateByPrimaryKey(PltStation record);
Long selectSomeCount(Map<String,Object> params);
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltStation.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltStation.java
index b4bc548..76b8489 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltStation.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltStation.java
@@ -30,6 +30,15 @@
public Long id;
/**
+ * 鐢熶骇绾縤d
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long lineId;
+
+ @TableField(exist = false)
+ public String lineName;
+
+ /**
* 缂栧彿
*/
@NotEmpty(message = "缂栧彿涓嶈兘涓虹┖")
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
index 4240ac2..db8786b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
@@ -6,19 +6,24 @@
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoPlt.PltStation">
<id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="lineId" column="line_id" jdbcType="BIGINT"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="dt" column="dt" jdbcType="TIMESTAMP"/>
<result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
+ <association property="lineName" column="line_id" javaType="java.lang.Long"
+ select="selectLineNameById" fetchType="eager" />
</resultMap>
<sql id="Base_Column_List">
- id,code,name,disabled,
+ id,line_id,code,name,disabled,
remark,dt,deleted
</sql>
-
+ <select id="selectLineNameById" parameterType="java.lang.Long" resultType="String">
+ select name from plt_production_line where id = #{lineId}
+ </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
@@ -26,61 +31,46 @@
where id = #{id,jdbcType=BIGINT}
</select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from plt_station
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation" useGeneratedKeys="true">
- insert into plt_station
- ( id,code,name
- ,remark,deleted
- )
- values (#{id,jdbcType=BIGINT},#{code,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR}
- ,#{remark,jdbcType=VARCHAR},#{deleted,jdbcType=TINYINT}
- )
- </insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation" useGeneratedKeys="true">
insert into plt_station
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
+ <if test="lineId != null">line_id,</if>
<if test="code != null">code,</if>
<if test="name != null">name,</if>
<if test="remark != null">remark,</if>
+ <if test="disabled != null">disabled,</if>
<if test="deleted != null">deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="lineId != null">#{lineId,jdbcType=VARCHAR},</if>
<if test="code != null">#{code,jdbcType=VARCHAR},</if>
<if test="name != null">#{name,jdbcType=VARCHAR},</if>
<if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
+ <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation">
update plt_station
<set>
- <if test="code != null">
- code = #{code,jdbcType=VARCHAR},
- </if>
- <if test="name != null">
- name = #{name,jdbcType=VARCHAR},
- </if>
- <if test="remark != null">
- remark = #{remark,jdbcType=VARCHAR},
- </if>
- <if test="deleted != null">
- deleted = #{deleted,jdbcType=TINYINT},
- </if>
+ <if test="code != null">
+ code = #{code,jdbcType=VARCHAR},
+ </if>
+ <if test="name != null">
+ name = #{name,jdbcType=VARCHAR},
+ </if>
+ <if test="remark != null">
+ remark = #{remark,jdbcType=VARCHAR},
+ </if>
+ <if test="disabled != null">
+ disabled = #{disabled,jdbcType=TINYINT},
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,jdbcType=TINYINT},
+ </if>
</set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation">
- update plt_station
- set
- code = #{code,jdbcType=VARCHAR},
- name = #{name,jdbcType=VARCHAR},
- remark = #{remark,jdbcType=VARCHAR},
- deleted = #{deleted,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
diff --git a/pms-parent/pms-global/src/main/resources/privileges-config.xml b/pms-parent/pms-global/src/main/resources/privileges-config.xml
index 2b40a70..52b3a00 100644
--- a/pms-parent/pms-global/src/main/resources/privileges-config.xml
+++ b/pms-parent/pms-global/src/main/resources/privileges-config.xml
@@ -6,18 +6,32 @@
type锛氱被鍨嬶紝闀垮害涓�4浣嶏紝鏄紪鐮佺殑鍓�4浣�
-->
<privileges>
- <!-- 鍩虹鏉� -->
- <privilege num="10100010" name="绯荤粺鏌ヨ" type="1010" typeName="鍩虹鏉�"></privilege>
- <privilege num="10100011" name="绯荤粺绠＄悊" type="1010" typeName="鍩虹鏉�"></privilege>
+ <!-- 绯荤粺绠＄悊 -->
+ <privilege num="10100000" name="鐢ㄦ埛鏌ヨ" type="1010" typeName="绯荤粺绠＄悊"></privilege>
+ <privilege num="10100001" name="鐢ㄦ埛绠＄悊" type="1010" typeName="绯荤粺绠＄悊"></privilege>
+ <privilege num="10100002" name="瑙掕壊鏌ヨ" type="1010" typeName="绯荤粺绠＄悊"></privilege>
+ <privilege num="10100003" name="瑙掕壊绠＄悊" type="1010" typeName="绯荤粺绠＄悊"></privilege>
+ <privilege num="10100004" name="鏉冮檺鏌ヨ" type="1010" typeName="绯荤粺绠＄悊"></privilege>
+ <privilege num="10100006" name="鏃ュ織鏌ヨ" type="1010" typeName="绯荤粺绠＄悊"></privilege>
+ <privilege num="10100007" name="缂栫爜鏌ヨ" type="1010" typeName="绯荤粺绠＄悊"></privilege>
<!-- 鐢熶骇绠＄悊 -->
- <privilege num="10200000" name="浜у搧鏌ヨ" type="1020" typeName="鐢熶骇绠＄悊"></privilege>
- <privilege num="10200001" name="浜у搧绠＄悊" type="1020" typeName="鐢熶骇绠＄悊"></privilege>
+ <privilege num="10200000" name="鐢熶骇鏌ヨ" type="1020" typeName="鐢熶骇绠＄悊"></privilege>
+ <privilege num="10200001" name="鐢熶骇绠＄悊" type="1020" typeName="鐢熶骇绠＄悊"></privilege>
<!-- 骞冲彴淇℃伅 -->
- <privilege num="10300000" name="骞冲彴鏌ヨ" type="1030" typeName="骞冲彴淇℃伅"></privilege>
- <privilege num="10300001" name="骞冲彴绠＄悊" type="1030" typeName="骞冲彴淇℃伅"></privilege>
-
+ <privilege num="10300000" name="浜у搧鏌ヨ" type="1030" typeName="骞冲彴淇℃伅"></privilege>
+ <privilege num="10300001" name="浜у搧绠＄悊" type="1030" typeName="骞冲彴淇℃伅"></privilege>
+ <privilege num="10300002" name="璐ㄦ椤圭洰鏌ヨ" type="1030" typeName="骞冲彴淇℃伅"></privilege>
+ <privilege num="10300003" name="璐ㄦ椤圭洰绠＄悊" type="1030" typeName="骞冲彴淇℃伅"></privilege>
+ <privilege num="10300004" name="鐢熶骇绾挎煡璇�" type="1030" typeName="骞冲彴淇℃伅"></privilege>
+ <privilege num="10300005" name="鐢熶骇绾跨鐞�" type="1030" typeName="骞冲彴淇℃伅"></privilege>
+ <privilege num="10300006" name="宸ョ珯鏌ヨ" type="1030" typeName="骞冲彴淇℃伅"></privilege>
+ <privilege num="10300007" name="宸ョ珯绠＄悊" type="1030" typeName="骞冲彴淇℃伅"></privilege>
+ <privilege num="10300008" name="涓嶅悎鏍煎師鍥犳煡璇�" type="1030" typeName="骞冲彴淇℃伅"></privilege>
+ <privilege num="10300009" name="涓嶅悎鏍煎師鍥犵鐞�" type="1030" typeName="骞冲彴淇℃伅"></privilege>
+ <privilege num="10300010" name="鎶ュ簾鍘熷洜鏌ヨ" type="1030" typeName="骞冲彴淇℃伅"></privilege>
+ <privilege num="10300011" name="鎶ュ簾鍘熷洜绠＄悊" type="1030" typeName="骞冲彴淇℃伅"></privilege>
</privileges>
</config>
\ No newline at end of file
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
index 215218d..5ce0987 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
@@ -30,7 +30,7 @@
* @return
*/
@GetMapping(path = "one")
- @SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10100006") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏌ヨ鍗曟潯鏃ュ織")
public BaseResponse<BaLog> one(String id){
try {
@@ -46,7 +46,7 @@
* @return
*/
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10100006") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏌ヨ鏃ュ織")
public BaseResponse<QueryResultVo<List<BaLog>>> some(@RequestBody QueryVo vo){
try {
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/privilege/PrivilegeCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/privilege/PrivilegeCtrl.java
index b0a9298..e07e8c7 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/privilege/PrivilegeCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/privilege/PrivilegeCtrl.java
@@ -36,7 +36,7 @@
* @return
*/
@GetMapping(path="getByType")
- @SsoPowerAop(power = "10100010")
+ @SsoPowerAop(power = "10100004")
public BaseResponse<List<Map<String, Object>>> getByType(){
try {
return BaseResponseUtils.buildSuccess(sv.selectByType());
@@ -52,7 +52,7 @@
* @return
*/
@RequestMapping(path="some")
- @SsoPowerAop(power = "10100010")
+ @SsoPowerAop(power = "10100004")
@Log("鏌ヨ鏉冮檺淇℃伅")
public BaseResponse<QueryResultVo<List<BaPrivilege>>> some(@RequestBody QueryVo vo){
try {
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
index 1c9f47e..409f9d5 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
@@ -14,6 +14,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
* 瑙掕壊绠＄悊
@@ -36,16 +37,25 @@
* @return
*/
@PostMapping(path="save")
- @SsoPowerAop(power = "10100011")
+ @SsoPowerAop(power = "10100003")
@Log("淇濆瓨瑙掕壊淇℃伅")
- public BaseResponse<BaRole> save(@RequestBody @Valid BaRole role,BindingResult bindingResult){
+ public BaseResponse<Boolean> save(@RequestBody @Valid BaRole role,BindingResult bindingResult){
+ int count;
try {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
role.setDeleted(false);
role.setDisabled(false);
- return BaseResponseUtils.buildSuccess(roleSv.save(role));
+ count = roleSv.save(role);
}catch (Exception e){
log.error("淇濆瓨瑙掕壊寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -57,14 +67,23 @@
* @return
*/
@PostMapping(path="update")
- @SsoPowerAop(power = "10100011")
+ @SsoPowerAop(power = "10100003")
@Log("鏇存柊瑙掕壊淇℃伅")
public BaseResponse<BaRole> update(@RequestBody @Valid BaRole role,BindingResult bindingResult){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(roleSv.update(role));
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+ count = roleSv.update(role);
}catch (Exception e){
log.error("鏇存柊瑙掕壊寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -74,14 +93,20 @@
* @return
*/
@GetMapping(path="delete")
- @SsoPowerAop(power = "10100011")
+ @SsoPowerAop(power = "10100003")
@Log("鍒犻櫎瑙掕壊淇℃伅")
- public BaseResponse<BaRole> delete(String id){
+ public BaseResponse<Boolean> delete(String id){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(roleSv.delete(Long.parseLong(id)));
+ count = roleSv.delete(Long.parseLong(id));
}catch (Exception e){
log.error("鍒犻櫎瑙掕壊寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -91,14 +116,20 @@
* @return
*/
@PostMapping(path="disabled")
- @SsoPowerAop(power = "10100011")
+ @SsoPowerAop(power = "10100003")
@Log("绂佺敤鎴栧惎鐢ㄨ鑹蹭俊鎭�")
- public BaseResponse<BaRole> disabled(@RequestBody BaRole role){
+ public BaseResponse<Boolean> disabled(@RequestBody BaRole role){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(roleSv.disabled(role.id,role.disabled));
+ count = roleSv.disabled(role.id,role.disabled);
}catch (Exception e){
log.error("绂佺敤瑙掕壊寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -108,7 +139,7 @@
* @return
*/
@GetMapping(path="one")
- @SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10100004") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ瑙掕壊淇℃伅")
public BaseResponse<BaRole> one(String id){
try{
@@ -125,7 +156,7 @@
* @return
*/
@GetMapping(path="all")
- @SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10100004") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏌ヨ鎵�鏈夎鑹�")
public BaseResponse<List<BaRole>> all(String id){
try{
@@ -143,7 +174,7 @@
* @return
*/
@PostMapping(path="some")
- @SsoPowerAop(power = "10100010")
+ @SsoPowerAop(power = "10100004")
@Log("鏌ヨ瑙掕壊淇℃伅")
public BaseResponse<QueryResultVo<List<BaRole>>> some(@RequestBody QueryVo vo){
try {
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
index 011ac5b..eae9aeb 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
@@ -61,7 +61,7 @@
*/
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
//@SsoAop() //鍙湁鐧诲綍楠岃瘉锛屾病鏈夋潈闄愰獙璇�
- @SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10100000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏌ヨ鐢ㄦ埛")
public BaseResponse<QueryResultVo<List<BaUser>>> some(@RequestBody QueryVo vo) {
try {
@@ -80,7 +80,7 @@
//@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)//鎸囧墠绔悜鍚庝紶鐨勫弬鏁扮被鍨�
@GetMapping(path = "one")
//@SsoAop() //鍙湁鐧诲綍楠岃瘉锛屾病鏈夋潈闄愰獙璇�
- @SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10100000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏌ヨ鍗曚釜鐢ㄦ埛")
public BaseResponse<BaUser> one(String id) {
try {
@@ -99,7 +99,7 @@
*/
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
//@SsoAop() //鍙湁鐧诲綍楠岃瘉锛屾病鏈夋潈闄愰獙璇�
- @SsoPowerAop(power = "10100011") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10100001") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("淇濆瓨鐢ㄦ埛淇℃伅")
public BaseResponse<Boolean> save(@RequestBody @Valid BaUser po, BindingResult bindingResult) {
if (bindingResult != null && bindingResult.hasErrors()) {
@@ -140,7 +140,7 @@
*/
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
//@SsoAop() //鍙湁鐧诲綍楠岃瘉锛屾病鏈夋潈闄愰獙璇�
- @SsoPowerAop(power = "10100011") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10100001") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏇存柊鐢ㄦ埛淇℃伅")
public BaseResponse<Boolean> update(@RequestBody @Validated BaUser po, BindingResult bindingResult) {
int count;
@@ -172,7 +172,7 @@
* @return
*/
@PostMapping(path="disabled")
- @SsoPowerAop(power = "10100011")
+ @SsoPowerAop(power = "10100001")
@Log("绂佺敤鎴栧惎鐢ㄧ敤鎴蜂俊鎭�")
public BaseResponse<BaRole> disabled(@RequestBody BaUser po){
try {
@@ -189,7 +189,7 @@
* @return
*/
@GetMapping(path = "delete")
- @SsoPowerAop(power = "10100011") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10100001") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鍒犻櫎鐢ㄦ埛")
public BaseResponse<Boolean> delete(Long id) {
int count;
@@ -269,7 +269,7 @@
*/
@PostMapping(path = "resetPassword", consumes = MediaType.APPLICATION_JSON_VALUE)
//@SsoAop() //鍙湁鐧诲綍楠岃瘉锛屾病鏈夋潈闄愰獙璇�
- @SsoPowerAop(power = "10100011") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10100001") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("閲嶇疆瀵嗙爜")
public BaseResponse<Boolean> resetPassword(@RequestBody @Validated ResetPasswordVo vo, BindingResult bindingResult) {
int count;
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
index ffd39ed..8abe361 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
@@ -40,19 +40,25 @@
* @return
*/
@PostMapping(path="save")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300003")
@Log("淇濆瓨浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
- public BaseResponse<PltProductParams> save(@RequestBody @Valid PltProductQualityInspectionItems item, BindingResult bindingResult){
+ public BaseResponse<Boolean> save(@RequestBody @Valid PltProductQualityInspectionItems item, BindingResult bindingResult){
+ int count = 0;
try {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
item.deleted = false;
item.disabled = false;
- return BaseResponseUtils.buildSuccess(sv.save(item));
+ count =sv.save(item);
}catch (Exception e){
log.error("淇濆瓨浜у搧鍝佽川妫�鏌ラ」鐩紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -64,17 +70,23 @@
* @return
*/
@PostMapping(path="update")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300003")
@Log("鏇存柊浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
- public BaseResponse<PltProductParams> update(@RequestBody @Valid PltProductQualityInspectionItems item,BindingResult bindingResult){
+ public BaseResponse<Boolean> update(@RequestBody @Valid PltProductQualityInspectionItems item,BindingResult bindingResult){
+ int count ;
try {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- return BaseResponseUtils.buildSuccess(sv.update(item));
+ count = sv.update(item);
}catch (Exception e){
log.error("鏇存柊浜у搧鍝佽川妫�鏌ラ」鐩紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -84,14 +96,20 @@
* @return
*/
@GetMapping(path="delete")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300003")
@Log("鍒犻櫎浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
- public BaseResponse<PltProductQualityInspectionItems> delete(String id){
+ public BaseResponse<Boolean> delete(String id){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
+ count = sv.delete(Long.parseLong(id));
}catch (Exception e){
log.error("鍒犻櫎浜у搧鍝佽川妫�鏌ラ」鐩紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -102,7 +120,7 @@
* @return
*/
@GetMapping(path="one")
- @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10300002") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
public BaseResponse<PltProductQualityInspectionItems> one(String id){
try{
@@ -120,7 +138,7 @@
* @return
*/
@PostMapping(path="some")
- @SsoPowerAop(power = "10300000")
+ @SsoPowerAop(power = "10300002")
@Log("鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
public BaseResponse<QueryResultVo<List<PltProductQualityInspectionItems>>> some(@RequestBody QueryVo vo){
try {
@@ -139,13 +157,19 @@
@PostMapping(path="disabled")
@SsoPowerAop(power = "10100011")
@Log("绂佺敤鎴栧惎鐢ㄨ川妫�椤圭洰")
- public BaseResponse<BaRole> disabled(@RequestBody PltProductUnqualifiedReason reason){
+ public BaseResponse<Boolean> disabled(@RequestBody PltProductUnqualifiedReason reason){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(sv.disabled(reason.id,reason.disabled));
+ count = sv.disabled(reason.id,reason.disabled);
}catch (Exception e){
log.error("绂佺敤鎴栧惎鐢ㄨ川妫�椤圭洰寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
}
}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsSv.java
index 0662956..943077d 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsSv.java
@@ -67,7 +67,7 @@
return rsVo ;
}
- public Object disabled(Long id, Boolean disabled) {
+ public int disabled(Long id, Boolean disabled) {
PltProductQualityInspectionItems item = new PltProductQualityInspectionItems();
item.setId(id);
item.setDisabled(disabled);
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineCtrl.java
index 7aab925..f319e04 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineCtrl.java
@@ -37,18 +37,25 @@
* @return
*/
@PostMapping(path="save")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300005")
@Log("淇濆瓨鐢熶骇绾�")
- public BaseResponse<PltProductionLine> save(@RequestBody @Valid PltProductionLine line,BindingResult bindingResult){
+ public BaseResponse<Boolean> save(@RequestBody @Valid PltProductionLine line,BindingResult bindingResult){
+ int count;
try {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ line.disabled = false;
line.deleted = false;
- return BaseResponseUtils.buildSuccess(sv.save(line));
+ count = sv.save(line);
}catch (Exception e){
log.error("淇濆瓨鐢熶骇绾垮紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -60,17 +67,23 @@
* @return
*/
@PostMapping(path="update")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300005")
@Log("鏇存柊鐢熶骇绾�")
- public BaseResponse<PltProductionLine> update(@RequestBody @Valid PltProductionLine line,BindingResult bindingResult){
+ public BaseResponse<Boolean> update(@RequestBody @Valid PltProductionLine line,BindingResult bindingResult){
+ int count;
try {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- return BaseResponseUtils.buildSuccess(sv.update(line));
+ count = sv.update(line);
}catch (Exception e){
log.error("鏇存柊鐢熶骇绾垮紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -80,14 +93,20 @@
* @return
*/
@GetMapping(path="delete")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300005")
@Log("鍒犻櫎鐢熶骇绾�")
- public BaseResponse<PltProductionLine> delete(String id){
+ public BaseResponse<Boolean> delete(String id){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
+ count = sv.delete(Long.parseLong(id));
}catch (Exception e){
log.error("鍒犻櫎鐢熶骇绾垮紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -98,7 +117,7 @@
* @return
*/
@GetMapping(path="one")
- @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10300004") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ鐢熶骇绾�")
public BaseResponse<PltProductionLine> one(String id){
try{
@@ -116,7 +135,7 @@
* @return
*/
@PostMapping(path="some")
- @SsoPowerAop(power = "10300000")
+ @SsoPowerAop(power = "10300004")
@Log("鍒嗛〉鏌ヨ鐢熶骇绾�")
public BaseResponse<QueryResultVo<List<PltProductionLine>>> some(@RequestBody QueryVo vo){
try {
@@ -133,7 +152,7 @@
* @return
*/
@GetMapping(path="all")
- @SsoPowerAop(power = "10300000")
+ @SsoPowerAop(power = "10300004")
@Log("鏌ヨ鎵�鏈夌敓浜х嚎")
public BaseResponse<List<PltProductionLine>> all(){
try {
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java
index ef71459..80bc77c 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRCtrl.java
@@ -39,18 +39,25 @@
* @return
*/
@PostMapping(path="save")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300011")
@Log("淇濆瓨浜у搧璁惧鎶ュ簾鍘熷洜")
- public BaseResponse<PltProductScrappingReason> save(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
+ public BaseResponse<Boolean> save(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
+ int count;
try {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ reason.disabled = false;
reason.deleted = false;
- return BaseResponseUtils.buildSuccess(sv.save(reason));
+ count = sv.save(reason);
}catch (Exception e){
log.error("淇濆瓨浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -62,17 +69,23 @@
* @return
*/
@PostMapping(path="update")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300011")
@Log("鏇存柊浜у搧璁惧鎶ュ簾鍘熷洜")
- public BaseResponse<PltProductScrappingReason> update(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
+ public BaseResponse<Boolean> update(@RequestBody @Valid PltProductScrappingReason reason,BindingResult bindingResult){
+ int count;
try {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- return BaseResponseUtils.buildSuccess(sv.update(reason));
+ count = sv.update(reason);
}catch (Exception e){
log.error("鏇存柊浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -82,14 +95,20 @@
* @return
*/
@GetMapping(path="delete")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300011")
@Log("鍒犻櫎浜у搧璁惧鎶ュ簾鍘熷洜")
- public BaseResponse<PltProductScrappingReason> delete(String id){
+ public BaseResponse<Boolean> delete(String id){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
+ count = sv.delete(Long.parseLong(id));
}catch (Exception e){
log.error("鍒犻櫎浜у搧璁惧鎶ュ簾鍘熷洜寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -100,7 +119,7 @@
* @return
*/
@GetMapping(path="one")
- @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10300010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜")
public BaseResponse<PltProductScrappingReason> one(String id){
try{
@@ -118,7 +137,7 @@
* @return
*/
@PostMapping(path="some")
- @SsoPowerAop(power = "10300000")
+ @SsoPowerAop(power = "10300010")
@Log("鏌ヨ浜у搧璁惧鎶ュ簾鍘熷洜")
public BaseResponse<QueryResultVo<List<PltProductScrappingReason>>> some(@RequestBody QueryVo vo){
try {
@@ -138,13 +157,19 @@
@PostMapping(path="disabled")
@SsoPowerAop(power = "10100011")
@Log("绂佺敤鎴栧惎鐢ㄦ姤搴熷師鍥�")
- public BaseResponse<BaRole> disabled(@RequestBody PltProductUnqualifiedReason reason){
+ public BaseResponse<Boolean> disabled(@RequestBody PltProductUnqualifiedReason reason){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(sv.disabled(reason.id,reason.disabled));
+ count = sv.disabled(reason.id,reason.disabled);
}catch (Exception e){
log.error("绂佺敤鎴栧惎鐢ㄦ姤搴熷師鍥犲紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
}
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
}
}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRSv.java
index 7b3ac1e..c4e4cd2 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRSv.java
@@ -70,7 +70,7 @@
return rsVo ;
}
- public Object disabled(Long id, Boolean disabled) {
+ public int disabled(Long id, Boolean disabled) {
PltProductScrappingReason reason = new PltProductScrappingReason();
reason.setId(id);
reason.setDisabled(disabled);
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURCtrl.java
index f534ddc..6c3e6e8 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURCtrl.java
@@ -6,8 +6,6 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
-import com.dy.pmsGlobal.pojoBa.BaRole;
-import com.dy.pmsGlobal.pojoPlt.PltProductParams;
import com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
@@ -39,19 +37,25 @@
* @return
*/
@PostMapping(path="save")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300009")
@Log("淇濆瓨浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
- public BaseResponse<PltProductParams> save(@RequestBody @Valid PltProductUnqualifiedReason reason,BindingResult bindingResult){
+ public BaseResponse<Boolean> save(@RequestBody @Valid PltProductUnqualifiedReason reason,BindingResult bindingResult){
+ int count;
try {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
reason.deleted = false;
reason.disabled = false;
- return BaseResponseUtils.buildSuccess(sv.save(reason));
+ count = sv.save(reason);
}catch (Exception e){
log.error("淇濆瓨浜у搧鐢熶骇涓嶅悎鏍煎師鍥犲紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -63,17 +67,23 @@
* @return
*/
@PostMapping(path="update")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300009")
@Log("鏇存柊浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
- public BaseResponse<PltProductUnqualifiedReason> update(@RequestBody @Valid PltProductUnqualifiedReason reason,BindingResult bindingResult){
+ public BaseResponse<Boolean> update(@RequestBody @Valid PltProductUnqualifiedReason reason,BindingResult bindingResult){
+ int count;
try {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- return BaseResponseUtils.buildSuccess(sv.update(reason));
+ count = sv.update(reason);
}catch (Exception e){
log.error("鏇存柊浜у搧鐢熶骇涓嶅悎鏍煎師鍥犲紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -83,14 +93,20 @@
* @return
*/
@GetMapping(path="delete")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300009")
@Log("鍒犻櫎浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
- public BaseResponse<PltProductUnqualifiedReason> delete(String id){
+ public BaseResponse<Boolean> delete(String id){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
+ count = sv.delete(Long.parseLong(id));
}catch (Exception e){
log.error("鍒犻櫎浜у搧鐢熶骇涓嶅悎鏍煎師鍥犲紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -101,7 +117,7 @@
* @return
*/
@GetMapping(path="one")
- @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10300008") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
public BaseResponse<PltProductUnqualifiedReason> one(String id){
try{
@@ -119,7 +135,7 @@
* @return
*/
@PostMapping(path="some")
- @SsoPowerAop(power = "10300000")
+ @SsoPowerAop(power = "10300008")
@Log("鏌ヨ浜у搧鐢熶骇涓嶅悎鏍煎師鍥�")
public BaseResponse<QueryResultVo<List<PltProductUnqualifiedReason>>> some(@RequestBody QueryVo vo){
try {
@@ -137,15 +153,21 @@
* @return
*/
@PostMapping(path="disabled")
- @SsoPowerAop(power = "10100011")
+ @SsoPowerAop(power = "10300009")
@Log("绂佺敤鎴栧惎鐢ㄤ笉鍚堟牸鍘熷洜")
- public BaseResponse<BaRole> disabled(@RequestBody PltProductUnqualifiedReason reason){
+ public BaseResponse<Boolean> disabled(@RequestBody PltProductUnqualifiedReason reason){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(sv.disabled(reason.id,reason.disabled));
+ count = sv.disabled(reason.id,reason.disabled);
}catch (Exception e){
log.error("绂佺敤鎴栧惎鐢ㄤ笉鍚堟牸鍘熷洜寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
}
}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java
index d80b107..65db33c 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java
@@ -70,7 +70,7 @@
return rsVo ;
}
- public Object disabled(Long id, Boolean disabled) {
+ public int disabled(Long id, Boolean disabled) {
PltProductUnqualifiedReason reason = new PltProductUnqualifiedReason();
reason.setId(id);
reason.setDisabled(disabled);
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
index aba78b9..a3d01fc 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
@@ -100,13 +100,19 @@
@GetMapping(path="delete")
@SsoPowerAop(power = "10300001")
@Log("鍒犻櫎浜у搧淇℃伅")
- public BaseResponse<PltProduct> delete(String id){
+ public BaseResponse<Boolean> delete(String id){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(proSv.delete(Long.parseLong(id)));
+ count = proSv.delete(Long.parseLong(id));
}catch (Exception e){
log.error("鍒犻櫎浜у搧寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
index 40ae28b..2e191f5 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
@@ -37,18 +37,25 @@
* @return
*/
@PostMapping(path="save")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300007")
@Log("淇濆瓨宸ョ珯")
- public BaseResponse<PltStation> save(@RequestBody @Valid PltStation station,BindingResult bindingResult){
+ public BaseResponse<Boolean> save(@RequestBody @Valid PltStation station,BindingResult bindingResult){
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+ int count;
try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
station.deleted = false;
- return BaseResponseUtils.buildSuccess(sv.save(station));
+ count = sv.save(station);
}catch (Exception e){
log.error("淇濆瓨宸ョ珯寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -60,17 +67,23 @@
* @return
*/
@PostMapping(path="update")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300007")
@Log("鏇存柊宸ョ珯")
- public BaseResponse<PltStation> update(@RequestBody @Valid PltStation station,BindingResult bindingResult){
+ public BaseResponse<Boolean> update(@RequestBody @Valid PltStation station,BindingResult bindingResult){
+ int count;
try {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- return BaseResponseUtils.buildSuccess(sv.update(station));
+ count = sv.update(station);
}catch (Exception e){
log.error("鏇存柊宸ョ珯寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -80,25 +93,28 @@
* @return
*/
@GetMapping(path="delete")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300007")
@Log("鍒犻櫎宸ョ珯")
- public BaseResponse<PltStation> delete(String id){
+ public BaseResponse<Boolean> delete(String id){
+ int count;
try {
- return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
+ count = sv.delete(Long.parseLong(id));
}catch (Exception e){
log.error("鍒犻櫎宸ョ珯寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
}
-
-
-
/**
* 鏍规嵁ID鏌ヨ
* @return
*/
@GetMapping(path="one")
- @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10300006") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ宸ョ珯")
public BaseResponse<PltStation> one(String id){
try{
@@ -116,7 +132,7 @@
* @return
*/
@PostMapping(path="some")
- @SsoPowerAop(power = "10300000")
+ @SsoPowerAop(power = "10300006")
@Log("鍒嗛〉鏌ヨ宸ョ珯")
public BaseResponse<QueryResultVo<List<PltStation>>> some(@RequestBody QueryVo vo){
try {
@@ -128,5 +144,22 @@
}
}
+ @PostMapping(path="disabled")
+ @SsoPowerAop(power = "10100011")
+ @Log("绂佺敤鎴栧惎鐢ㄥ伐绔�")
+ public BaseResponse<Boolean> disabled(@RequestBody PltStation station){
+ int count;
+ try {
+ count = sv.disabled(station.id,station.disabled);
+ }catch (Exception e){
+ log.error("绂佺敤鎴栧惎鐢ㄥ伐绔欏紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
index fafb724..bcf3c05 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
@@ -76,5 +76,11 @@
return rsVo ;
}
+ public int disabled(Long id, Boolean disabled) {
+ PltStation station = new PltStation();
+ station.setId(id);
+ station.setDisabled(disabled);
+ return dao.updateByPrimaryKeySelective(station);
+ }
}
--
Gitblit v1.8.0