diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java index ae9354903e2a5751c9e36b35c7795f9a09e86fca..141d9d64ebc2cf7ea484e79f8e5d332449263053 100644 --- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java +++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java @@ -11,6 +11,7 @@ package com.cetc32.dh.common.response; import com.cetc32.dh.entity.NumberS; import com.cetc32.dh.entity.SysInfo; +import com.cetc32.dh.entity.pritrace; import java.util.List; @@ -29,6 +30,10 @@ public class PageDataResult extends ResponseMessage{ private List list; + public PageDataResult(Integer count, List pritraces, Integer offset) { + super(); + } + public List getList_new() { return list_new; diff --git a/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java b/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java new file mode 100644 index 0000000000000000000000000000000000000000..98cebe8861d2b1c03ca3063bd0ec88844e4bd25d --- /dev/null +++ b/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java @@ -0,0 +1,26 @@ +package com.cetc32.dh.controller.rest; + +import com.cetc32.dh.common.response.PageDataResult; +import com.cetc32.dh.dto.pritraceDTO; +import com.cetc32.dh.entity.pritrace; +import com.cetc32.dh.service.PritraceService; +import com.cetc32.webutil.common.annotations.LoginRequired; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@LoginRequired +@RestController +@RequestMapping("/pritrace") +public class PritraceController { + @Autowired + PritraceService pritraceService; + + @PostMapping("/findbyuser") + public PageDataResult findByUser(@RequestBody pritraceDTO pritraceDTO){ + List pritraces = pritraceService.selectByUser(pritraceDTO.getUser()); + Integer count = pritraceService.selectByUser(pritraceDTO.getUser()).size(); + return new PageDataResult(count,pritraces); + } +} diff --git a/src/main/java/com/cetc32/dh/dto/pritraceDTO.java b/src/main/java/com/cetc32/dh/dto/pritraceDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..d47e03051d0b135bb86df4212fe51b9d815f2a1f --- /dev/null +++ b/src/main/java/com/cetc32/dh/dto/pritraceDTO.java @@ -0,0 +1,15 @@ +package com.cetc32.dh.dto; + +import com.cetc32.dh.entity.NumberS; + +public class pritraceDTO extends NumberS { + private String user; + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/src/main/java/com/cetc32/dh/entity/pritrace.java b/src/main/java/com/cetc32/dh/entity/pritrace.java index 196a714c33c114807df1fb96cd157c3bd918adb4..8f22271b6762cf6e9dbf3a2edc48fcb64eb0ebda 100644 --- a/src/main/java/com/cetc32/dh/entity/pritrace.java +++ b/src/main/java/com/cetc32/dh/entity/pritrace.java @@ -1,6 +1,6 @@ package com.cetc32.dh.entity; -public class pritrace { +public class pritrace extends NumberS { private String user; private Integer departid; diff --git a/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java b/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java index 29e5ae972d955328dc14ef1cf2d9fa9a2731dac3..28c0f7b41494ad7684098018d3891f84e675b3fe 100644 --- a/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java @@ -1,9 +1,13 @@ package com.cetc32.dh.mybatis; import com.cetc32.dh.entity.pritrace; +import org.springframework.stereotype.Repository; +import tk.mapper.MyMapper; -public interface pritraceMapper { - int insert(pritrace record); +import java.util.List; - int insertSelective(pritrace record); +@Repository +public interface pritraceMapper extends MyMapper { + + List selectByUser(String user); } \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/service/PritraceService.java b/src/main/java/com/cetc32/dh/service/PritraceService.java new file mode 100644 index 0000000000000000000000000000000000000000..ec2425b0aa285a44a9d85c334c07973a1d2196a2 --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/PritraceService.java @@ -0,0 +1,9 @@ +package com.cetc32.dh.service; + +import com.cetc32.dh.entity.pritrace; + +import java.util.List; + +public interface PritraceService { + List selectByUser(String user); +} diff --git a/src/main/java/com/cetc32/dh/service/impl/PritraceServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/PritraceServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..e10048b924c276104a68ea69693c10b0f13a7853 --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/impl/PritraceServiceImpl.java @@ -0,0 +1,21 @@ +package com.cetc32.dh.service.impl; + +import com.cetc32.dh.entity.pritrace; +import com.cetc32.dh.mybatis.pritraceMapper; +import com.cetc32.dh.service.PritraceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class PritraceServiceImpl implements PritraceService { + @Autowired + pritraceMapper pritraceMapper; + + @Override + public List selectByUser(String user){ + return pritraceMapper.selectByUser(user); + } + +} diff --git a/src/main/resources/application-win.yml b/src/main/resources/application-win.yml index 2bed5865124f2e9c9c4a4395599376f1da6027fb..23f06b172d331045913c2da0033f5c1deb9ed8d8 100644 --- a/src/main/resources/application-win.yml +++ b/src/main/resources/application-win.yml @@ -75,3 +75,4 @@ sso: basePermission: S000接口用户 #单位是毫秒 tokeAge: 3600000 +departmentRoot: 1 \ No newline at end of file diff --git a/src/main/resources/mapper/pritraceMapper.xml b/src/main/resources/mapper/pritraceMapper.xml index b0418f45220f98027c994a528fbf6a214835e7b8..5199985403478e17589d602fa3957ba55b11850f 100644 --- a/src/main/resources/mapper/pritraceMapper.xml +++ b/src/main/resources/mapper/pritraceMapper.xml @@ -2,30 +2,13 @@ - - + + - - insert into pritrace (user, departId) - values (#{user,jdbcType=VARCHAR}, #{departid,jdbcType=INTEGER}) - - - insert into pritrace - - - user, - - - departId, - - - - - #{user,jdbcType=VARCHAR}, - - - #{departid,jdbcType=INTEGER}, - - - + + \ No newline at end of file