diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java new file mode 100644 index 0000000..40d93cd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java @@ -0,0 +1,13 @@ +package com.casic.missiles.mapper.system; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.node.ZTreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SystemDeptMapper { + + List treeByDept(@Param("pid") String pid, @Param("deptType") String deptType, @Param("tips") String tips); + +} diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java new file mode 100644 index 0000000..40d93cd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java @@ -0,0 +1,13 @@ +package com.casic.missiles.mapper.system; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.node.ZTreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SystemDeptMapper { + + List treeByDept(@Param("pid") String pid, @Param("deptType") String deptType, @Param("tips") String tips); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml new file mode 100644 index 0000000..093586f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml @@ -0,0 +1,51 @@ + + + + + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + '%[' || + #{pid,jdbcType=VARCHAR} + || + ']%' + + diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java new file mode 100644 index 0000000..40d93cd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java @@ -0,0 +1,13 @@ +package com.casic.missiles.mapper.system; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.node.ZTreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SystemDeptMapper { + + List treeByDept(@Param("pid") String pid, @Param("deptType") String deptType, @Param("tips") String tips); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml new file mode 100644 index 0000000..093586f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml @@ -0,0 +1,51 @@ + + + + + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + '%[' || + #{pid,jdbcType=VARCHAR} + || + ']%' + + diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c96e056..748151c 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-job - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java new file mode 100644 index 0000000..40d93cd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java @@ -0,0 +1,13 @@ +package com.casic.missiles.mapper.system; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.node.ZTreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SystemDeptMapper { + + List treeByDept(@Param("pid") String pid, @Param("deptType") String deptType, @Param("tips") String tips); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml new file mode 100644 index 0000000..093586f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml @@ -0,0 +1,51 @@ + + + + + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + '%[' || + #{pid,jdbcType=VARCHAR} + || + ']%' + + diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c96e056..748151c 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-job - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 50173ef..634ac7d 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -8,13 +8,16 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.system.ISystemDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -43,4 +46,11 @@ public ReturnDTO> companyList() { return ReturnUtil.success(systemDeptService.getAllCompanyList()); } + + @ApiOperation("组织树查询接口") + @GetMapping({"/deptTree"}) + @ResponseBody + public SuccessResponseData tree(@ApiParam("父节点ID") String pid) { + return new SuccessResponseData(systemDeptService.treeByDept(pid)); + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java new file mode 100644 index 0000000..40d93cd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java @@ -0,0 +1,13 @@ +package com.casic.missiles.mapper.system; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.node.ZTreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SystemDeptMapper { + + List treeByDept(@Param("pid") String pid, @Param("deptType") String deptType, @Param("tips") String tips); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml new file mode 100644 index 0000000..093586f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml @@ -0,0 +1,51 @@ + + + + + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + '%[' || + #{pid,jdbcType=VARCHAR} + || + ']%' + + diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c96e056..748151c 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-job - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 50173ef..634ac7d 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -8,13 +8,16 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.system.ISystemDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -43,4 +46,11 @@ public ReturnDTO> companyList() { return ReturnUtil.success(systemDeptService.getAllCompanyList()); } + + @ApiOperation("组织树查询接口") + @GetMapping({"/deptTree"}) + @ResponseBody + public SuccessResponseData tree(@ApiParam("父节点ID") String pid) { + return new SuccessResponseData(systemDeptService.treeByDept(pid)); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 3b81720..6efd648 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 compile diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java new file mode 100644 index 0000000..40d93cd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java @@ -0,0 +1,13 @@ +package com.casic.missiles.mapper.system; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.node.ZTreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SystemDeptMapper { + + List treeByDept(@Param("pid") String pid, @Param("deptType") String deptType, @Param("tips") String tips); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml new file mode 100644 index 0000000..093586f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml @@ -0,0 +1,51 @@ + + + + + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + '%[' || + #{pid,jdbcType=VARCHAR} + || + ']%' + + diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c96e056..748151c 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-job - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 50173ef..634ac7d 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -8,13 +8,16 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.system.ISystemDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -43,4 +46,11 @@ public ReturnDTO> companyList() { return ReturnUtil.success(systemDeptService.getAllCompanyList()); } + + @ApiOperation("组织树查询接口") + @GetMapping({"/deptTree"}) + @ResponseBody + public SuccessResponseData tree(@ApiParam("父节点ID") String pid) { + return new SuccessResponseData(systemDeptService.treeByDept(pid)); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 3b81720..6efd648 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index e15abc7..09c934a 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java new file mode 100644 index 0000000..40d93cd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java @@ -0,0 +1,13 @@ +package com.casic.missiles.mapper.system; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.node.ZTreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SystemDeptMapper { + + List treeByDept(@Param("pid") String pid, @Param("deptType") String deptType, @Param("tips") String tips); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml new file mode 100644 index 0000000..093586f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml @@ -0,0 +1,51 @@ + + + + + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + '%[' || + #{pid,jdbcType=VARCHAR} + || + ']%' + + diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c96e056..748151c 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-job - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 50173ef..634ac7d 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -8,13 +8,16 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.system.ISystemDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -43,4 +46,11 @@ public ReturnDTO> companyList() { return ReturnUtil.success(systemDeptService.getAllCompanyList()); } + + @ApiOperation("组织树查询接口") + @GetMapping({"/deptTree"}) + @ResponseBody + public SuccessResponseData tree(@ApiParam("父节点ID") String pid) { + return new SuccessResponseData(systemDeptService.treeByDept(pid)); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 3b81720..6efd648 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index e15abc7..09c934a 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index dacab94..877d1c0 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-common - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java new file mode 100644 index 0000000..40d93cd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java @@ -0,0 +1,13 @@ +package com.casic.missiles.mapper.system; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.node.ZTreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SystemDeptMapper { + + List treeByDept(@Param("pid") String pid, @Param("deptType") String deptType, @Param("tips") String tips); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml new file mode 100644 index 0000000..093586f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml @@ -0,0 +1,51 @@ + + + + + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + '%[' || + #{pid,jdbcType=VARCHAR} + || + ']%' + + diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c96e056..748151c 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-job - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 50173ef..634ac7d 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -8,13 +8,16 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.system.ISystemDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -43,4 +46,11 @@ public ReturnDTO> companyList() { return ReturnUtil.success(systemDeptService.getAllCompanyList()); } + + @ApiOperation("组织树查询接口") + @GetMapping({"/deptTree"}) + @ResponseBody + public SuccessResponseData tree(@ApiParam("父节点ID") String pid) { + return new SuccessResponseData(systemDeptService.treeByDept(pid)); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 3b81720..6efd648 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index e15abc7..09c934a 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index dacab94..877d1c0 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-common - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java index b168cc1..5327988 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java @@ -12,6 +12,7 @@ import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.equipment.IEquipmentModifyLogService; import com.casic.missiles.utils.CasicBeanUtil; +import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.Signature; @@ -37,6 +38,7 @@ @Aspect @Component @EnableAsync +@Slf4j public class EquipmentLogAop { @Autowired @@ -93,11 +95,12 @@ return ObjectUtil.isNotEmpty(val) ? Long.valueOf(val) : null; } + // @Async @After(value="logPointCut()") - @Async public void after(JoinPoint joinPoint){ if(ObjectUtil.isNotEmpty(equipmentId) && ObjectUtil.isNotEmpty(oldInfo)){ EquipmentInfo newInfo = equipmentInfoService.getById(equipmentId); + log.info("equipment info:{}, {},{}",equipmentId,JSONObject.toJSON(oldInfo),JSONObject.toJSON(newInfo)); JSONArray res = CasicBeanUtil.fieldCompareDetail(oldInfo,newInfo,null); if(ObjectUtil.isNotEmpty(res) && res.size() > 0){ StringBuilder stringBuilder = new StringBuilder(); @@ -111,6 +114,7 @@ stringBuilder.append(msg); } } + log.info("equipment modify: {}",stringBuilder); saveLog(equipmentId,stringBuilder.toString()); } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java new file mode 100644 index 0000000..40d93cd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java @@ -0,0 +1,13 @@ +package com.casic.missiles.mapper.system; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.node.ZTreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SystemDeptMapper { + + List treeByDept(@Param("pid") String pid, @Param("deptType") String deptType, @Param("tips") String tips); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml new file mode 100644 index 0000000..093586f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml @@ -0,0 +1,51 @@ + + + + + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + '%[' || + #{pid,jdbcType=VARCHAR} + || + ']%' + + diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c96e056..748151c 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-job - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 50173ef..634ac7d 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -8,13 +8,16 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.system.ISystemDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -43,4 +46,11 @@ public ReturnDTO> companyList() { return ReturnUtil.success(systemDeptService.getAllCompanyList()); } + + @ApiOperation("组织树查询接口") + @GetMapping({"/deptTree"}) + @ResponseBody + public SuccessResponseData tree(@ApiParam("父节点ID") String pid) { + return new SuccessResponseData(systemDeptService.treeByDept(pid)); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 3b81720..6efd648 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index e15abc7..09c934a 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index dacab94..877d1c0 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-common - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java index b168cc1..5327988 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java @@ -12,6 +12,7 @@ import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.equipment.IEquipmentModifyLogService; import com.casic.missiles.utils.CasicBeanUtil; +import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.Signature; @@ -37,6 +38,7 @@ @Aspect @Component @EnableAsync +@Slf4j public class EquipmentLogAop { @Autowired @@ -93,11 +95,12 @@ return ObjectUtil.isNotEmpty(val) ? Long.valueOf(val) : null; } + // @Async @After(value="logPointCut()") - @Async public void after(JoinPoint joinPoint){ if(ObjectUtil.isNotEmpty(equipmentId) && ObjectUtil.isNotEmpty(oldInfo)){ EquipmentInfo newInfo = equipmentInfoService.getById(equipmentId); + log.info("equipment info:{}, {},{}",equipmentId,JSONObject.toJSON(oldInfo),JSONObject.toJSON(newInfo)); JSONArray res = CasicBeanUtil.fieldCompareDetail(oldInfo,newInfo,null); if(ObjectUtil.isNotEmpty(res) && res.size() > 0){ StringBuilder stringBuilder = new StringBuilder(); @@ -111,6 +114,7 @@ stringBuilder.append(msg); } } + log.info("equipment modify: {}",stringBuilder); saveLog(equipmentId,stringBuilder.toString()); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java index 4f3e46d..94c0faf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java @@ -2,18 +2,16 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.mapper.system.SystemDeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.system.ISystemDeptService; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.GetMapping; import java.util.ArrayList; import java.util.List; @@ -27,6 +25,7 @@ private final AbstractDeptService deptService; private final AbstractPermissionContext permissionContext; + private final SystemDeptMapper systemDeptMapper; @Override public Dept getUserCompany() { @@ -68,4 +67,12 @@ Dept dept = deptService.getById(deptId); return dept.getPid() <= 0; } + + @Override + public List treeByDept(String pid) { + List allDept = deptService.list(null); + allDept = allDept.stream().filter(i-> StrUtil.isNotBlank(i.getPids()) && i.getPids().contains(pid)).collect(Collectors.toList()); + return allDept; +// return systemDeptMapper.treeByDept(pid, deptType, tips); + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java new file mode 100644 index 0000000..40d93cd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java @@ -0,0 +1,13 @@ +package com.casic.missiles.mapper.system; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.node.ZTreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SystemDeptMapper { + + List treeByDept(@Param("pid") String pid, @Param("deptType") String deptType, @Param("tips") String tips); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml new file mode 100644 index 0000000..093586f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml @@ -0,0 +1,51 @@ + + + + + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + '%[' || + #{pid,jdbcType=VARCHAR} + || + ']%' + + diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c96e056..748151c 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-job - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 50173ef..634ac7d 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -8,13 +8,16 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.system.ISystemDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -43,4 +46,11 @@ public ReturnDTO> companyList() { return ReturnUtil.success(systemDeptService.getAllCompanyList()); } + + @ApiOperation("组织树查询接口") + @GetMapping({"/deptTree"}) + @ResponseBody + public SuccessResponseData tree(@ApiParam("父节点ID") String pid) { + return new SuccessResponseData(systemDeptService.treeByDept(pid)); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 3b81720..6efd648 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index e15abc7..09c934a 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index dacab94..877d1c0 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-common - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java index b168cc1..5327988 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java @@ -12,6 +12,7 @@ import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.equipment.IEquipmentModifyLogService; import com.casic.missiles.utils.CasicBeanUtil; +import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.Signature; @@ -37,6 +38,7 @@ @Aspect @Component @EnableAsync +@Slf4j public class EquipmentLogAop { @Autowired @@ -93,11 +95,12 @@ return ObjectUtil.isNotEmpty(val) ? Long.valueOf(val) : null; } + // @Async @After(value="logPointCut()") - @Async public void after(JoinPoint joinPoint){ if(ObjectUtil.isNotEmpty(equipmentId) && ObjectUtil.isNotEmpty(oldInfo)){ EquipmentInfo newInfo = equipmentInfoService.getById(equipmentId); + log.info("equipment info:{}, {},{}",equipmentId,JSONObject.toJSON(oldInfo),JSONObject.toJSON(newInfo)); JSONArray res = CasicBeanUtil.fieldCompareDetail(oldInfo,newInfo,null); if(ObjectUtil.isNotEmpty(res) && res.size() > 0){ StringBuilder stringBuilder = new StringBuilder(); @@ -111,6 +114,7 @@ stringBuilder.append(msg); } } + log.info("equipment modify: {}",stringBuilder); saveLog(equipmentId,stringBuilder.toString()); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java index 4f3e46d..94c0faf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java @@ -2,18 +2,16 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.mapper.system.SystemDeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.system.ISystemDeptService; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.GetMapping; import java.util.ArrayList; import java.util.List; @@ -27,6 +25,7 @@ private final AbstractDeptService deptService; private final AbstractPermissionContext permissionContext; + private final SystemDeptMapper systemDeptMapper; @Override public Dept getUserCompany() { @@ -68,4 +67,12 @@ Dept dept = deptService.getById(deptId); return dept.getPid() <= 0; } + + @Override + public List treeByDept(String pid) { + List allDept = deptService.list(null); + allDept = allDept.stream().filter(i-> StrUtil.isNotBlank(i.getPids()) && i.getPids().contains(pid)).collect(Collectors.toList()); + return allDept; +// return systemDeptMapper.treeByDept(pid, deptType, tips); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java index 65d5b7f..86a5bcb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java @@ -1,7 +1,9 @@ package com.casic.missiles.service.system; +import com.casic.missiles.core.node.ZTreeNode; import com.casic.missiles.modular.system.model.Dept; + import java.util.List; public interface ISystemDeptService { @@ -11,4 +13,7 @@ List getAllCompanyList(); boolean isCompany(Long deptId); + + List treeByDept(String pid); + } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 88c1e56..7b7f3c7 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 813cfc8..46a1c68 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java new file mode 100644 index 0000000..40d93cd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemDeptMapper.java @@ -0,0 +1,13 @@ +package com.casic.missiles.mapper.system; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.node.ZTreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SystemDeptMapper { + + List treeByDept(@Param("pid") String pid, @Param("deptType") String deptType, @Param("tips") String tips); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml new file mode 100644 index 0000000..093586f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemDeptMapper.xml @@ -0,0 +1,51 @@ + + + + + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + CONCAT + ('%[', + #{pid,jdbcType=VARCHAR}, + ']%' + ) + + + '%[' || + #{pid,jdbcType=VARCHAR} + || + ']%' + + diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c96e056..748151c 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-job - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 50173ef..634ac7d 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -8,13 +8,16 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.system.ISystemDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -43,4 +46,11 @@ public ReturnDTO> companyList() { return ReturnUtil.success(systemDeptService.getAllCompanyList()); } + + @ApiOperation("组织树查询接口") + @GetMapping({"/deptTree"}) + @ResponseBody + public SuccessResponseData tree(@ApiParam("父节点ID") String pid) { + return new SuccessResponseData(systemDeptService.treeByDept(pid)); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 3b81720..6efd648 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.0.0 + 1.2.0.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index e15abc7..09c934a 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index dacab94..877d1c0 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.2.0.0 + 1.2.0.2 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-model - 1.2.0.0 + 1.2.0.2 com.casic casic-metering-common - 1.2.0.0 + 1.2.0.2 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java index b168cc1..5327988 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java @@ -12,6 +12,7 @@ import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.equipment.IEquipmentModifyLogService; import com.casic.missiles.utils.CasicBeanUtil; +import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.Signature; @@ -37,6 +38,7 @@ @Aspect @Component @EnableAsync +@Slf4j public class EquipmentLogAop { @Autowired @@ -93,11 +95,12 @@ return ObjectUtil.isNotEmpty(val) ? Long.valueOf(val) : null; } + // @Async @After(value="logPointCut()") - @Async public void after(JoinPoint joinPoint){ if(ObjectUtil.isNotEmpty(equipmentId) && ObjectUtil.isNotEmpty(oldInfo)){ EquipmentInfo newInfo = equipmentInfoService.getById(equipmentId); + log.info("equipment info:{}, {},{}",equipmentId,JSONObject.toJSON(oldInfo),JSONObject.toJSON(newInfo)); JSONArray res = CasicBeanUtil.fieldCompareDetail(oldInfo,newInfo,null); if(ObjectUtil.isNotEmpty(res) && res.size() > 0){ StringBuilder stringBuilder = new StringBuilder(); @@ -111,6 +114,7 @@ stringBuilder.append(msg); } } + log.info("equipment modify: {}",stringBuilder); saveLog(equipmentId,stringBuilder.toString()); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java index 4f3e46d..94c0faf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemDeptServiceImpl.java @@ -2,18 +2,16 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.mapper.system.SystemDeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.system.ISystemDeptService; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.GetMapping; import java.util.ArrayList; import java.util.List; @@ -27,6 +25,7 @@ private final AbstractDeptService deptService; private final AbstractPermissionContext permissionContext; + private final SystemDeptMapper systemDeptMapper; @Override public Dept getUserCompany() { @@ -68,4 +67,12 @@ Dept dept = deptService.getById(deptId); return dept.getPid() <= 0; } + + @Override + public List treeByDept(String pid) { + List allDept = deptService.list(null); + allDept = allDept.stream().filter(i-> StrUtil.isNotBlank(i.getPids()) && i.getPids().contains(pid)).collect(Collectors.toList()); + return allDept; +// return systemDeptMapper.treeByDept(pid, deptType, tips); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java index 65d5b7f..86a5bcb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemDeptService.java @@ -1,7 +1,9 @@ package com.casic.missiles.service.system; +import com.casic.missiles.core.node.ZTreeNode; import com.casic.missiles.modular.system.model.Dept; + import java.util.List; public interface ISystemDeptService { @@ -11,4 +13,7 @@ List getAllCompanyList(); boolean isCompany(Long deptId); + + List treeByDept(String pid); + } diff --git a/pom.xml b/pom.xml index 19922c1..5e6743b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-eqpt-xichang - 1.2.0.0 + 1.2.0.2 casic-metering-eqpt-xichang pom