pms-parent/pms-global/src/main/resources/mapper/TstCommandMapper.xml
@@ -51,14 +51,14 @@ <if test="name != null and name !=''"> name like concat('%', #{name}, '%') and </if> <if test="factory != null and factory !=''"> factory like concat('%', #{factory}, '%') and <if test="proId != null"> proId = #{proId,jdbcType=BIGINT} </if> <if test="director != null and director !=''"> director like concat('%', #{director}, '%') and <if test="value != null and value !=''"> value like concat('%', #{value}, '%') and </if> <if test="dMobile != null and dMobile !=''"> d_mobile = #{dMobile,jdbcType=VARCHAR} and <if test="type != null"> type = #{type,jdbcType=TINYINT} and </if> </trim> order by id desc @@ -76,14 +76,14 @@ <if test="name != null and name !=''"> name like concat('%', #{name}, '%') and </if> <if test="factory != null and factory !=''"> factory like concat('%', #{factory}, '%') and <if test="proId != null"> proId = #{proId,jdbcType=BIGINT} </if> <if test="director != null and director !=''"> director like concat('%', #{director}, '%') and <if test="value != null and value !=''"> value like concat('%', #{value}, '%') and </if> <if test="dMobile != null and dMobile !=''"> d_mobile = #{dMobile,jdbcType=VARCHAR} and <if test="type != null"> type = #{type,jdbcType=TINYINT} and </if> </trim> </select> pms-parent/pms-test/src/main/java/com/dy/pmsTest/command/CommandCtrl.java
@@ -34,11 +34,9 @@ * @return */ @PostMapping(path="save") @SsoPowerAop(power = "10300005") @SsoPowerAop(power = "-1") @Log("保存指令") public BaseResponse<Boolean> save(@RequestBody @Valid TstCommand command){ command.disabled = false; command.deleted = false; int count = sv.save(command); if (count <= 0) { return BaseResponseUtils.buildFail("数据库存储失败"); @@ -53,7 +51,7 @@ * @return */ @PostMapping(path="update") @SsoPowerAop(power = "10300005") @SsoPowerAop(power = "-1") @Log("更新指令") public BaseResponse<Boolean> update(@RequestBody @Valid TstCommand command){ int count = sv.update(command); @@ -70,7 +68,7 @@ * @return */ @GetMapping(path="delete") @SsoPowerAop(power = "10300005") @SsoPowerAop(power = "-1") @Log("删除指令") public BaseResponse<Boolean> delete(String id){ int count = sv.delete(Long.parseLong(id)); @@ -86,7 +84,7 @@ * @return */ @GetMapping(path="one") @SsoPowerAop(power = "10300004") //登录与权限同时验证 @SsoPowerAop(power = "-1") //登录与权限同时验证 @Log("根据ID查询指令") public BaseResponse<TstCommand> one(String id){ TstCommand param=sv.selectById(id); @@ -99,7 +97,7 @@ * @return */ @PostMapping(path="some") @SsoPowerAop(power = "10300004") @SsoPowerAop(power = "-1") @Log("分页查询指令") public BaseResponse<QueryResultVo<List<TstCommand>>> some(@RequestBody QueryVo vo){ QueryResultVo<List<TstCommand>> list = sv.selectSome(vo) ; @@ -111,7 +109,7 @@ * @return */ @GetMapping(path="all") @SsoPowerAop(power = "10300004") @SsoPowerAop(power = "-1") @Log("查询所有指令") public BaseResponse<List<TstCommand>> all(){ List<TstCommand> list = sv.selectAll(); pms-parent/pms-test/src/main/java/com/dy/pmsTest/command/CommandSv.java
@@ -1,14 +1,20 @@ package com.dy.pmsTest.command; import com.dy.common.webFilter.UserTokenContext; import com.dy.common.webUtil.QueryResultVo; import com.dy.pmsGlobal.daoPr.PrOrderItemMapper; import com.dy.pmsGlobal.daoPr.PrOrderMapper; import com.dy.pmsGlobal.daoTst.TstCommandMapper; import com.dy.pmsGlobal.pojoBa.BaUser; import com.dy.pmsGlobal.pojoTst.TstCommand; import com.dy.pmsGlobal.util.UserUtil; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; import java.util.Map; @@ -16,10 +22,15 @@ @Service public class CommandSv { private TstCommandMapper dao; private UserUtil userUtil; @Autowired public void setDao(TstCommandMapper dao) { this.dao = dao; } @Autowired public void setUserUtil(UserUtil userUtil) { this.userUtil = userUtil; } @Transactional @@ -27,6 +38,13 @@ if(dao.selectByNameId(command.id,command.proId,command.name)>0){ throw new RuntimeException("指令名称已存在"); } command.disabled = false; command.deleted = false; /* BaUser loginUser = userUtil.getUser(UserTokenContext.get()); if (loginUser != null) { command.createBy = loginUser.id; }*/ command.createDate = new Date(); int count = dao.insertSelective(command); return count; } @@ -47,12 +65,17 @@ if(dao.selectByNameId(command.id,command.proId,command.name)>0){ throw new RuntimeException("指令名称已存在"); } /* BaUser loginUser = userUtil.getUser(UserTokenContext.get()); if (loginUser != null) { command.updatedBy = loginUser.id; }*/ command.updatedDate = new Date(); int count = dao.updateByPrimaryKeySelective(command); return count; } public TstCommand selectById(String lineId) { return dao.selectByPrimaryKey(Long.valueOf(lineId)); public TstCommand selectById(String id) { return dao.selectByPrimaryKey(Long.valueOf(id)); } /** pms-parent/pms-test/src/main/java/com/dy/pmsTest/command/QueryVo.java
@@ -12,7 +12,7 @@ public class QueryVo extends QueryConditionVo { public String name; public String proId; public String type; public Long proId; public Integer type; public String value; }