java110-bean/src/main/java/com/java110/dto/dataPrivilegeUnit/DataPrivilegeUnitDto.java
@@ -1,6 +1,7 @@ package com.java110.dto.dataPrivilegeUnit; import com.java110.dto.PageDto; import java.io.Serializable; import java.util.Date; @@ -15,13 +16,13 @@ public class DataPrivilegeUnitDto extends PageDto implements Serializable { private String floorId; private String dpUnitId; private String dpId; private String unitNum; private String unitId; private String remark; private String communityId; private String floorNum; private String dpUnitId; private String dpId; private String unitNum; private String unitId; private String remark; private String communityId; private String floorNum; private Date createTime; @@ -32,49 +33,64 @@ public String getFloorId() { return floorId; } public void setFloorId(String floorId) { public void setFloorId(String floorId) { this.floorId = floorId; } public String getDpUnitId() { public String getDpUnitId() { return dpUnitId; } public void setDpUnitId(String dpUnitId) { public void setDpUnitId(String dpUnitId) { this.dpUnitId = dpUnitId; } public String getDpId() { public String getDpId() { return dpId; } public void setDpId(String dpId) { public void setDpId(String dpId) { this.dpId = dpId; } public String getUnitNum() { public String getUnitNum() { return unitNum; } public void setUnitNum(String unitNum) { public void setUnitNum(String unitNum) { this.unitNum = unitNum; } public String getUnitId() { public String getUnitId() { return unitId; } public void setUnitId(String unitId) { public void setUnitId(String unitId) { this.unitId = unitId; } public String getRemark() { public String getRemark() { return remark; } public void setRemark(String remark) { public void setRemark(String remark) { this.remark = remark; } public String getCommunityId() { public String getCommunityId() { return communityId; } public void setCommunityId(String communityId) { public void setCommunityId(String communityId) { this.communityId = communityId; } public String getFloorNum() { public String getFloorNum() { return floorNum; } public void setFloorNum(String floorNum) { public void setFloorNum(String floorNum) { this.floorNum = floorNum; } java110-db/src/main/resources/mapper/community/DataPrivilegeUnitV1ServiceDaoImplMapper.xml
@@ -128,4 +128,44 @@ </select> <select id="queryUnitsNotInDataPrivilegeCount" parameterType="Map" resultType="Map"> select count(1) count from building_unit t inner join f_floor f on t.floor_id = f.floor_id and f.status_cd = '0' left join data_privilege_unit dp on t.unit_id = dp.unit_id and dp.status_cd = '0' and dp.community_id = f.community_id and dp.dp_id = #{dpId} where t.status_cd = '0' and f.community_id = #{communityId} and dp.dp_id is null <if test="floorNum !=null and floorNum != ''"> and f.floor_num= #{floorNum} </if> <if test="unitNum !=null and unitNum != ''"> and t.unit_num= #{unitNum} </if> </select> <!-- 查询系统配置信息 add by wuxw 2018-07-03 --> <select id="queryUnitsNotInDataPrivilege" parameterType="Map" resultType="Map"> select f.floor_num floorNum,t.floor_id floorId,t.unit_id unitId,t.unit_num unitNum from building_unit t inner join f_floor f on t.floor_id = f.floor_id and f.status_cd = '0' left join data_privilege_unit dp on t.unit_id = dp.unit_id and dp.status_cd = '0' and dp.community_id = f.community_id and dp.dp_id = #{dpId} where t.status_cd = '0' and f.community_id = #{communityId} and dp.dp_id is null <if test="floorNum !=null and floorNum != ''"> and f.floor_num= #{floorNum} </if> <if test="unitNum !=null and unitNum != ''"> and t.unit_num= #{unitNum} </if> order by t.create_time desc <if test="page != -1 and page != null "> limit #{page}, #{row} </if> </select> </mapper> java110-interface/src/main/java/com/java110/intf/community/IDataPrivilegeUnitV1InnerServiceSMO.java
@@ -16,6 +16,7 @@ package com.java110.intf.community; import com.java110.config.feign.FeignConfiguration; import com.java110.dto.UnitDto; import com.java110.dto.dataPrivilegeUnit.DataPrivilegeUnitDto; import com.java110.po.dataPrivilegeUnit.DataPrivilegeUnitPo; import org.springframework.cloud.openfeign.FeignClient; @@ -65,4 +66,10 @@ */ @RequestMapping(value = "/queryDataPrivilegeUnitsCount", method = RequestMethod.POST) int queryDataPrivilegeUnitsCount(@RequestBody DataPrivilegeUnitDto dataPrivilegeUnitDto); @RequestMapping(value = "/queryUnitsNotInDataPrivilegeCount", method = RequestMethod.POST) int queryUnitsNotInDataPrivilegeCount(@RequestBody DataPrivilegeUnitDto dataPrivilegeUnitDto); @RequestMapping(value = "/queryUnitsNotInDataPrivilege", method = RequestMethod.POST) List<UnitDto> queryUnitsNotInDataPrivilege(@RequestBody DataPrivilegeUnitDto dataPrivilegeUnitDto); } service-community/src/main/java/com/java110/community/cmd/dataPrivilegeUnit/ListUnitsNotInDataPrivilegeCmd.java
New file @@ -0,0 +1,85 @@ /* * Copyright 2017-2020 吴学文 and java110 team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.community.cmd.dataPrivilegeUnit; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.UnitDto; import com.java110.intf.community.IDataPrivilegeUnitV1InnerServiceSMO; import com.java110.po.dataPrivilegeUnit.DataPrivilegeUnitPo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import com.java110.dto.dataPrivilegeUnit.DataPrivilegeUnitDto; import java.util.List; import java.util.ArrayList; import org.springframework.http.ResponseEntity; import org.springframework.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * 类表述:查询 * 服务编码:dataPrivilegeUnit.listDataPrivilegeUnit * 请求路劲:/app/dataPrivilegeUnit.ListDataPrivilegeUnit * add by 吴学文 at 2022-09-28 16:32:34 mail: 928255095@qq.com * open source address: https://gitee.com/wuxw7/MicroCommunity * 官网:http://www.homecommunity.cn * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行 */ @Java110Cmd(serviceCode = "dataPrivilegeUnit.listUnitsNotInDataPrivilege") public class ListUnitsNotInDataPrivilegeCmd extends Cmd { private static Logger logger = LoggerFactory.getLogger(ListDataPrivilegeUnitCmd.class); @Autowired private IDataPrivilegeUnitV1InnerServiceSMO dataPrivilegeUnitV1InnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) { super.validatePageInfo(reqJson); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException { DataPrivilegeUnitDto dataPrivilegeUnitDto = BeanConvertUtil.covertBean(reqJson, DataPrivilegeUnitDto.class); int count = dataPrivilegeUnitV1InnerServiceSMOImpl.queryUnitsNotInDataPrivilegeCount(dataPrivilegeUnitDto); List<UnitDto> unitDtos = null; if (count > 0) { unitDtos = dataPrivilegeUnitV1InnerServiceSMOImpl.queryUnitsNotInDataPrivilege(dataPrivilegeUnitDto); } else { unitDtos = new ArrayList<>(); } ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, unitDtos); ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK); cmdDataFlowContext.setResponseEntity(responseEntity); } } service-community/src/main/java/com/java110/community/dao/IDataPrivilegeUnitV1ServiceDao.java
@@ -74,4 +74,7 @@ */ int queryDataPrivilegeUnitsCount(Map info); int queryUnitsNotInDataPrivilegeCount(Map info); List<Map> queryUnitsNotInDataPrivilege(Map map); } service-community/src/main/java/com/java110/community/dao/impl/DataPrivilegeUnitV1ServiceDaoImpl.java
@@ -108,5 +108,26 @@ return Integer.parseInt(businessDataPrivilegeUnitInfos.get(0).get("count").toString()); } @Override public int queryUnitsNotInDataPrivilegeCount(Map info) { logger.debug("查询 queryUnitsNotInDataPrivilegeCount 入参 info : {}",info); List<Map> businessDataPrivilegeUnitInfos = sqlSessionTemplate.selectList("dataPrivilegeUnitV1ServiceDaoImpl.queryUnitsNotInDataPrivilegeCount", info); if (businessDataPrivilegeUnitInfos.size() < 1) { return 0; } return Integer.parseInt(businessDataPrivilegeUnitInfos.get(0).get("count").toString()); } @Override public List<Map> queryUnitsNotInDataPrivilege(Map info) { logger.debug("修改 queryUnitsNotInDataPrivilege 入参 info : {}",info); List<Map> unitDtos = sqlSessionTemplate.selectList("dataPrivilegeUnitV1ServiceDaoImpl.queryUnitsNotInDataPrivilege",info); return unitDtos; } } service-community/src/main/java/com/java110/community/smo/impl/DataPrivilegeUnitV1InnerServiceSMOImpl.java
@@ -17,6 +17,7 @@ import com.java110.community.dao.IDataPrivilegeUnitV1ServiceDao; import com.java110.dto.UnitDto; import com.java110.intf.community.IDataPrivilegeUnitV1InnerServiceSMO; import com.java110.dto.dataPrivilegeUnit.DataPrivilegeUnitDto; import com.java110.po.dataPrivilegeUnit.DataPrivilegeUnitPo; @@ -86,4 +87,26 @@ public int queryDataPrivilegeUnitsCount(@RequestBody DataPrivilegeUnitDto dataPrivilegeUnitDto) { return dataPrivilegeUnitV1ServiceDaoImpl.queryDataPrivilegeUnitsCount(BeanConvertUtil.beanCovertMap(dataPrivilegeUnitDto)); } @Override public int queryUnitsNotInDataPrivilegeCount(@RequestBody DataPrivilegeUnitDto dataPrivilegeUnitDto) { return dataPrivilegeUnitV1ServiceDaoImpl.queryUnitsNotInDataPrivilegeCount(BeanConvertUtil.beanCovertMap(dataPrivilegeUnitDto)); } @Override public List<UnitDto> queryUnitsNotInDataPrivilege(@RequestBody DataPrivilegeUnitDto dataPrivilegeUnitDto) { //校验是否传了 分页信息 int page = dataPrivilegeUnitDto.getPage(); if (page != PageDto.DEFAULT_PAGE) { dataPrivilegeUnitDto.setPage((page - 1) * dataPrivilegeUnitDto.getRow()); } List<UnitDto> unitDtos = BeanConvertUtil.covertBeanList( dataPrivilegeUnitV1ServiceDaoImpl.queryUnitsNotInDataPrivilege(BeanConvertUtil.beanCovertMap(dataPrivilegeUnitDto)), UnitDto.class); return unitDtos; } }