From a7ab180711bb95eceff4763a7fcb09c7f0d36f2e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 21 二月 2024 15:27:02 +0800
Subject: [PATCH] 优化代码
---
service-store/src/main/java/com/java110/store/smo/impl/ComplaintV1InnerServiceSMOImpl.java | 6
/dev/null | 98 ------------
java110-db/src/main/resources/mapper/store/ComplaintV1ServiceDaoImplMapper.xml | 312 ++++++++++++++++++++------------------
service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java | 2
service-store/src/main/java/com/java110/store/dao/impl/ComplaintV1ServiceDaoImpl.java | 8 +
service-store/src/main/java/com/java110/store/cmd/complaint/AuditComplaintCmd.java | 2
service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java | 2
java110-interface/src/main/java/com/java110/intf/store/IComplaintV1InnerServiceSMO.java | 4
service-store/src/main/java/com/java110/store/dao/IComplaintV1ServiceDao.java | 1
9 files changed, 185 insertions(+), 250 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/ComplaintV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/ComplaintV1ServiceDaoImplMapper.xml
deleted file mode 100644
index bbdb988..0000000
--- a/java110-db/src/main/resources/mapper/community/ComplaintV1ServiceDaoImplMapper.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="complaintV1ServiceDaoImpl">
-
-
- <!-- 淇濆瓨鎶曡瘔寤鸿淇℃伅 add by wuxw 2018-07-03 -->
- <insert id="saveComplaintInfo" parameterType="Map">
- insert into complaint(
- start_user_id,complaint_id,type_cd,context,complaint_name,tel,state,store_id,community_id,room_id
- ) values (
- #{startUserId},#{complaintId},#{typeCd},#{context},#{complaintName},#{tel},#{state},#{storeId},#{communityId},#{roomId}
- )
- </insert>
-
-
- <!-- 鏌ヨ鎶曡瘔寤鸿淇℃伅 add by wuxw 2018-07-03 -->
- <select id="getComplaintInfo" parameterType="Map" resultType="Map">
- select t.start_user_id,t.start_user_id startUserId,t.complaint_id,t.complaint_id complaintId,t.type_cd,t.type_cd
- typeCd,t.context,t.complaint_name,t.complaint_name complaintName,t.tel,t.status_cd,t.status_cd
- statusCd,t.state,t.store_id,t.store_id storeId,t.community_id,t.community_id communityId,t.room_id,t.room_id
- roomId
- from complaint t
- where 1 =1
- <if test="startUserId !=null and startUserId != ''">
- and t.start_user_id= #{startUserId}
- </if>
- <if test="complaintId !=null and complaintId != ''">
- and t.complaint_id= #{complaintId}
- </if>
- <if test="typeCd !=null and typeCd != ''">
- and t.type_cd= #{typeCd}
- </if>
- <if test="context !=null and context != ''">
- and t.context= #{context}
- </if>
- <if test="complaintName !=null and complaintName != ''">
- and t.complaint_name= #{complaintName}
- </if>
- <if test="tel !=null and tel != ''">
- and t.tel= #{tel}
- </if>
- <if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
- </if>
- <if test="state !=null and state != ''">
- and t.state= #{state}
- </if>
- <if test="storeId !=null and storeId != ''">
- and t.store_id= #{storeId}
- </if>
- <if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
- </if>
- <if test="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
- </if>
- order by t.create_time desc
- <if test="page != -1 and page != null ">
- limit #{page}, #{row}
- </if>
-
- </select>
-
-
- <!-- 淇敼鎶曡瘔寤鸿淇℃伅 add by wuxw 2018-07-03 -->
- <update id="updateComplaintInfo" parameterType="Map">
- update complaint t set t.status_cd = #{statusCd}
- <if test="newBId != null and newBId != ''">
- ,t.b_id = #{newBId}
- </if>
- <if test="startUserId !=null and startUserId != ''">
- , t.start_user_id= #{startUserId}
- </if>
- <if test="typeCd !=null and typeCd != ''">
- , t.type_cd= #{typeCd}
- </if>
- <if test="context !=null and context != ''">
- , t.context= #{context}
- </if>
- <if test="complaintName !=null and complaintName != ''">
- , t.complaint_name= #{complaintName}
- </if>
- <if test="tel !=null and tel != ''">
- , t.tel= #{tel}
- </if>
- <if test="state !=null and state != ''">
- , t.state= #{state}
- </if>
- <if test="storeId !=null and storeId != ''">
- , t.store_id= #{storeId}
- </if>
- <if test="communityId !=null and communityId != ''">
- , t.community_id= #{communityId}
- </if>
- <if test="roomId !=null and roomId != ''">
- , t.room_id= #{roomId}
- </if>
- where 1=1
- <if test="complaintId !=null and complaintId != ''">
- and t.complaint_id= #{complaintId}
- </if>
-
- </update>
-
- <!-- 鏌ヨ鎶曡瘔寤鸿鏁伴噺 add by wuxw 2018-07-03 -->
- <select id="queryComplaintsCount" parameterType="Map" resultType="Map">
- select count(1) count
- from complaint t
- where 1 =1
- <if test="startUserId !=null and startUserId != ''">
- and t.start_user_id= #{startUserId}
- </if>
- <if test="complaintId !=null and complaintId != ''">
- and t.complaint_id= #{complaintId}
- </if>
- <if test="typeCd !=null and typeCd != ''">
- and t.type_cd= #{typeCd}
- </if>
- <if test="context !=null and context != ''">
- and t.context= #{context}
- </if>
- <if test="complaintName !=null and complaintName != ''">
- and t.complaint_name= #{complaintName}
- </if>
- <if test="tel !=null and tel != ''">
- and t.tel= #{tel}
- </if>
- <if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
- </if>
- <if test="state !=null and state != ''">
- and t.state= #{state}
- </if>
- <if test="storeId !=null and storeId != ''">
- and t.store_id= #{storeId}
- </if>
- <if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
- </if>
- <if test="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
- </if>
-
-
- </select>
-
- <select id="queryComplaintCountByOwnerTels" parameterType="Map" resultType="Map">
- select t.tel ownerTel,count(1) complaintCount
- from
- complaint t
- where t.status_cd = '0'
- and t.community_id = #{communityId}
- and t.tel in
- <foreach collection="ownerTels" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
- group by t.tel
- </select>
-
-</mapper>
diff --git a/java110-db/src/main/resources/mapper/store/ComplaintV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/ComplaintV1ServiceDaoImplMapper.xml
index 2206dc3..23880e9 100644
--- a/java110-db/src/main/resources/mapper/store/ComplaintV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/ComplaintV1ServiceDaoImplMapper.xml
@@ -5,174 +5,188 @@
<mapper namespace="complaintV1ServiceDaoImpl">
-
-
-
<!-- 淇濆瓨鎶曡瘔淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveComplaintInfo" parameterType="Map">
insert into complaint(
-store_id,owner_id,room_id,room_name,start_user_id,complaint_id,type_cd,owner_name,context,complaint_name,tel,state,community_id
-) values (
-#{storeId},#{ownerId},#{roomId},#{roomName},#{startUserId},#{complaintId},#{typeCd},#{ownerName},#{context},#{complaintName},#{tel},#{state},#{communityId}
-)
+ store_id,owner_id,room_id,room_name,start_user_id,complaint_id,type_cd,owner_name,context,complaint_name,tel,state,community_id
+ ) values (
+ #{storeId},#{ownerId},#{roomId},#{roomName},#{startUserId},#{complaintId},#{typeCd},#{ownerName},#{context},#{complaintName},#{tel},#{state},#{communityId}
+ )
</insert>
-
<!-- 鏌ヨ鎶曡瘔淇℃伅 add by wuxw 2018-07-03 -->
<select id="getComplaintInfo" parameterType="Map" resultType="Map">
- select t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.owner_id,t.owner_id ownerId,t.room_id,t.room_id roomId,t.room_name,t.room_name roomName,t.start_user_id,t.start_user_id startUserId,t.complaint_id,t.complaint_id complaintId,t.type_cd,t.type_cd typeCd,t.owner_name,t.owner_name ownerName,t.context,t.complaint_name,t.complaint_name complaintName,t.tel,t.state,t.community_id,t.community_id communityId
-from complaint t
-where 1 =1
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="storeId !=null and storeId != ''">
- and t.store_id= #{storeId}
-</if>
-<if test="ownerId !=null and ownerId != ''">
- and t.owner_id= #{ownerId}
-</if>
-<if test="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
-</if>
-<if test="roomName !=null and roomName != ''">
- and t.room_name= #{roomName}
-</if>
-<if test="startUserId !=null and startUserId != ''">
- and t.start_user_id= #{startUserId}
-</if>
-<if test="complaintId !=null and complaintId != ''">
- and t.complaint_id= #{complaintId}
-</if>
-<if test="typeCd !=null and typeCd != ''">
- and t.type_cd= #{typeCd}
-</if>
-<if test="ownerName !=null and ownerName != ''">
- and t.owner_name= #{ownerName}
-</if>
-<if test="context !=null and context != ''">
- and t.context= #{context}
-</if>
-<if test="complaintName !=null and complaintName != ''">
- and t.complaint_name= #{complaintName}
-</if>
-<if test="tel !=null and tel != ''">
- and t.tel= #{tel}
-</if>
-<if test="state !=null and state != ''">
- and t.state= #{state}
-</if>
-<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
-</if>
-order by t.create_time desc
-<if test="page != -1 and page != null ">
- limit #{page}, #{row}
-</if>
+ select t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.owner_id,t.owner_id
+ ownerId,t.room_id,t.room_id roomId,t.room_name,t.room_name roomName,t.start_user_id,t.start_user_id
+ startUserId,t.complaint_id,t.complaint_id complaintId,t.type_cd,t.type_cd typeCd,t.owner_name,t.owner_name
+ ownerName,t.context,t.complaint_name,t.complaint_name complaintName,t.tel,t.state,t.community_id,t.community_id
+ communityId
+ from complaint t
+ where 1 =1
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="storeId !=null and storeId != ''">
+ and t.store_id= #{storeId}
+ </if>
+ <if test="ownerId !=null and ownerId != ''">
+ and t.owner_id= #{ownerId}
+ </if>
+ <if test="roomId !=null and roomId != ''">
+ and t.room_id= #{roomId}
+ </if>
+ <if test="roomName !=null and roomName != ''">
+ and t.room_name= #{roomName}
+ </if>
+ <if test="startUserId !=null and startUserId != ''">
+ and t.start_user_id= #{startUserId}
+ </if>
+ <if test="complaintId !=null and complaintId != ''">
+ and t.complaint_id= #{complaintId}
+ </if>
+ <if test="typeCd !=null and typeCd != ''">
+ and t.type_cd= #{typeCd}
+ </if>
+ <if test="ownerName !=null and ownerName != ''">
+ and t.owner_name= #{ownerName}
+ </if>
+ <if test="context !=null and context != ''">
+ and t.context= #{context}
+ </if>
+ <if test="complaintName !=null and complaintName != ''">
+ and t.complaint_name= #{complaintName}
+ </if>
+ <if test="tel !=null and tel != ''">
+ and t.tel= #{tel}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
</select>
-
-
<!-- 淇敼鎶曡瘔淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateComplaintInfo" parameterType="Map">
- update complaint t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if>
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if>
-<if test="ownerId !=null and ownerId != ''">
-, t.owner_id= #{ownerId}
-</if>
-<if test="roomId !=null and roomId != ''">
-, t.room_id= #{roomId}
-</if>
-<if test="roomName !=null and roomName != ''">
-, t.room_name= #{roomName}
-</if>
-<if test="startUserId !=null and startUserId != ''">
-, t.start_user_id= #{startUserId}
-</if>
-<if test="typeCd !=null and typeCd != ''">
-, t.type_cd= #{typeCd}
-</if>
-<if test="ownerName !=null and ownerName != ''">
-, t.owner_name= #{ownerName}
-</if>
-<if test="context !=null and context != ''">
-, t.context= #{context}
-</if>
-<if test="complaintName !=null and complaintName != ''">
-, t.complaint_name= #{complaintName}
-</if>
-<if test="tel !=null and tel != ''">
-, t.tel= #{tel}
-</if>
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if>
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if>
- where 1=1 <if test="complaintId !=null and complaintId != ''">
-and t.complaint_id= #{complaintId}
-</if>
+ update complaint t set t.status_cd = #{statusCd}
+ <if test="newBId != null and newBId != ''">
+ ,t.b_id = #{newBId}
+ </if>
+
+ <if test="ownerId !=null and ownerId != ''">
+ , t.owner_id= #{ownerId}
+ </if>
+ <if test="roomId !=null and roomId != ''">
+ , t.room_id= #{roomId}
+ </if>
+ <if test="roomName !=null and roomName != ''">
+ , t.room_name= #{roomName}
+ </if>
+ <if test="startUserId !=null and startUserId != ''">
+ , t.start_user_id= #{startUserId}
+ </if>
+ <if test="typeCd !=null and typeCd != ''">
+ , t.type_cd= #{typeCd}
+ </if>
+ <if test="ownerName !=null and ownerName != ''">
+ , t.owner_name= #{ownerName}
+ </if>
+ <if test="context !=null and context != ''">
+ , t.context= #{context}
+ </if>
+ <if test="complaintName !=null and complaintName != ''">
+ , t.complaint_name= #{complaintName}
+ </if>
+ <if test="tel !=null and tel != ''">
+ , t.tel= #{tel}
+ </if>
+ <if test="state !=null and state != ''">
+ , t.state= #{state}
+ </if>
+
+ where 1=1
+ <if test="complaintId !=null and complaintId != ''">
+ and t.complaint_id= #{complaintId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="storeId !=null and storeId != ''">
+ and t.store_id= #{storeId}
+ </if>
</update>
<!-- 鏌ヨ鎶曡瘔鏁伴噺 add by wuxw 2018-07-03 -->
- <select id="queryComplaintsCount" parameterType="Map" resultType="Map">
- select count(1) count
-from complaint t
-where 1 =1
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="storeId !=null and storeId != ''">
- and t.store_id= #{storeId}
-</if>
-<if test="ownerId !=null and ownerId != ''">
- and t.owner_id= #{ownerId}
-</if>
-<if test="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
-</if>
-<if test="roomName !=null and roomName != ''">
- and t.room_name= #{roomName}
-</if>
-<if test="startUserId !=null and startUserId != ''">
- and t.start_user_id= #{startUserId}
-</if>
-<if test="complaintId !=null and complaintId != ''">
- and t.complaint_id= #{complaintId}
-</if>
-<if test="typeCd !=null and typeCd != ''">
- and t.type_cd= #{typeCd}
-</if>
-<if test="ownerName !=null and ownerName != ''">
- and t.owner_name= #{ownerName}
-</if>
-<if test="context !=null and context != ''">
- and t.context= #{context}
-</if>
-<if test="complaintName !=null and complaintName != ''">
- and t.complaint_name= #{complaintName}
-</if>
-<if test="tel !=null and tel != ''">
- and t.tel= #{tel}
-</if>
-<if test="state !=null and state != ''">
- and t.state= #{state}
-</if>
-<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
-</if>
+ <select id="queryComplaintsCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from complaint t
+ where 1 =1
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="storeId !=null and storeId != ''">
+ and t.store_id= #{storeId}
+ </if>
+ <if test="ownerId !=null and ownerId != ''">
+ and t.owner_id= #{ownerId}
+ </if>
+ <if test="roomId !=null and roomId != ''">
+ and t.room_id= #{roomId}
+ </if>
+ <if test="roomName !=null and roomName != ''">
+ and t.room_name= #{roomName}
+ </if>
+ <if test="startUserId !=null and startUserId != ''">
+ and t.start_user_id= #{startUserId}
+ </if>
+ <if test="complaintId !=null and complaintId != ''">
+ and t.complaint_id= #{complaintId}
+ </if>
+ <if test="typeCd !=null and typeCd != ''">
+ and t.type_cd= #{typeCd}
+ </if>
+ <if test="ownerName !=null and ownerName != ''">
+ and t.owner_name= #{ownerName}
+ </if>
+ <if test="context !=null and context != ''">
+ and t.context= #{context}
+ </if>
+ <if test="complaintName !=null and complaintName != ''">
+ and t.complaint_name= #{complaintName}
+ </if>
+ <if test="tel !=null and tel != ''">
+ and t.tel= #{tel}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
- </select>
+ </select>
+
+ <select id="queryComplaintCountByOwnerTels" parameterType="Map" resultType="Map">
+ select t.tel ownerTel,count(1) complaintCount
+ from
+ complaint t
+ where t.status_cd = '0'
+ and t.community_id = #{communityId}
+ and t.tel in
+ <foreach collection="ownerTels" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ group by t.tel
+ </select>
</mapper>
diff --git a/java110-interface/src/main/java/com/java110/intf/community/IComplaintV1InnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/community/IComplaintV1InnerServiceSMO.java
deleted file mode 100644
index 60999d3..0000000
--- a/java110-interface/src/main/java/com/java110/intf/community/IComplaintV1InnerServiceSMO.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.intf.community;
-
-import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.complaint.ComplaintDto;
-import com.java110.po.complaint.ComplaintPo;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绫昏〃杩帮細 鏈嶅姟涔嬪墠璋冪敤鐨勬帴鍙ｇ被锛屼笉瀵瑰鎻愪緵鎺ュ彛鑳藉姏 鍙敤浜庢帴鍙ｅ缓璋冪敤
- * add by 鍚村鏂� at 2022-07-17 00:29:44 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 瀹樼綉锛歨ttp://www.homecommunity.cn
- * 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
- * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
- */
-@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
-@RequestMapping("/complaintV1Api")
-public interface IComplaintV1InnerServiceSMO {
-
-
- @RequestMapping(value = "/saveComplaint", method = RequestMethod.POST)
- public int saveComplaint(@RequestBody ComplaintPo complaintPo);
-
- @RequestMapping(value = "/updateComplaint", method = RequestMethod.POST)
- public int updateComplaint(@RequestBody ComplaintPo complaintPo);
-
- @RequestMapping(value = "/deleteComplaint", method = RequestMethod.POST)
- public int deleteComplaint(@RequestBody ComplaintPo complaintPo);
-
- /**
- * <p>鏌ヨ灏忓尯妤间俊鎭�</p>
- *
- *
- * @param complaintDto 鏁版嵁瀵硅薄鍒嗕韩
- * @return ComplaintDto 瀵硅薄鏁版嵁
- */
- @RequestMapping(value = "/queryComplaints", method = RequestMethod.POST)
- List<ComplaintDto> queryComplaints(@RequestBody ComplaintDto complaintDto);
-
- /**
- * 鏌ヨ<p>灏忓尯妤�</p>鎬昏褰曟暟
- *
- * @param complaintDto 鏁版嵁瀵硅薄鍒嗕韩
- * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
- */
- @RequestMapping(value = "/queryComplaintsCount", method = RequestMethod.POST)
- int queryComplaintsCount(@RequestBody ComplaintDto complaintDto);
-
- @RequestMapping(value = "/queryComplaintCountByOwnerTels", method = RequestMethod.POST)
- List<Map> queryComplaintCountByOwnerTels(@RequestBody Map ownerTels);
-}
diff --git a/java110-interface/src/main/java/com/java110/intf/store/IComplaintV1InnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/store/IComplaintV1InnerServiceSMO.java
index ab8f7d0..d94077f 100644
--- a/java110-interface/src/main/java/com/java110/intf/store/IComplaintV1InnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/store/IComplaintV1InnerServiceSMO.java
@@ -24,6 +24,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import java.util.List;
+import java.util.Map;
/**
* 绫昏〃杩帮細 鏈嶅姟涔嬪墠璋冪敤鐨勬帴鍙ｇ被锛屼笉瀵瑰鎻愪緵鎺ュ彛鑳藉姏 鍙敤浜庢帴鍙ｅ缓璋冪敤
@@ -65,4 +66,7 @@
*/
@RequestMapping(value = "/queryComplaintsCount", method = RequestMethod.POST)
int queryComplaintsCount(@RequestBody ComplaintDto complaintDto);
+
+ @RequestMapping(value = "/queryComplaintsCount", method = RequestMethod.POST)
+ List<Map> queryComplaintCountByOwnerTels(@RequestBody Map info);
}
diff --git a/service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java b/service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java
index 743047d..21ebd4b 100644
--- a/service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java
@@ -2,7 +2,7 @@
import com.java110.community.bmo.room.IQueryRoomStatisticsBMO;
import com.java110.dto.room.RoomDto;
-import com.java110.intf.community.IComplaintV1InnerServiceSMO;
+import com.java110.intf.store.IComplaintV1InnerServiceSMO;
import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
import com.java110.intf.store.IContractRoomInnerServiceSMO;
diff --git a/service-community/src/main/java/com/java110/community/dao/IComplaintV1ServiceDao.java b/service-community/src/main/java/com/java110/community/dao/IComplaintV1ServiceDao.java
deleted file mode 100644
index c7d1665..0000000
--- a/service-community/src/main/java/com/java110/community/dao/IComplaintV1ServiceDao.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.dao;
-
-
-import com.java110.utils.exception.DAOException;
-
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绫昏〃杩帮細
- * add by 鍚村鏂� at 2022-07-17 00:29:44 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 瀹樼綉锛歨ttp://www.homecommunity.cn
- * 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
- * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
- */
-public interface IComplaintV1ServiceDao {
-
-
- /**
- * 淇濆瓨 鎶曡瘔寤鸿淇℃伅
- * @param info
- * @throws DAOException DAO寮傚父
- */
- int saveComplaintInfo(Map info) throws DAOException;
-
-
-
-
- /**
- * 鏌ヨ鎶曡瘔寤鸿淇℃伅锛坕nstance杩囩▼锛�
- * 鏍规嵁bId 鏌ヨ鎶曡瘔寤鸿淇℃伅
- * @param info bId 淇℃伅
- * @return 鎶曡瘔寤鸿淇℃伅
- * @throws DAOException DAO寮傚父
- */
- List<Map> getComplaintInfo(Map info) throws DAOException;
-
-
-
- /**
- * 淇敼鎶曡瘔寤鸿淇℃伅
- * @param info 淇敼淇℃伅
- * @throws DAOException DAO寮傚父
- */
- int updateComplaintInfo(Map info) throws DAOException;
-
-
- /**
- * 鏌ヨ鎶曡瘔寤鸿鎬绘暟
- *
- * @param info 鎶曡瘔寤鸿淇℃伅
- * @return 鎶曡瘔寤鸿鏁伴噺
- */
- int queryComplaintsCount(Map info);
-
- List<Map> queryComplaintCountByOwnerTels(Map info);
-}
diff --git a/service-community/src/main/java/com/java110/community/dao/impl/ComplaintV1ServiceDaoImpl.java b/service-community/src/main/java/com/java110/community/dao/impl/ComplaintV1ServiceDaoImpl.java
deleted file mode 100644
index 8ef63aa..0000000
--- a/service-community/src/main/java/com/java110/community/dao/impl/ComplaintV1ServiceDaoImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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.dao.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.exception.DAOException;
-import com.java110.utils.util.DateUtil;
-import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.community.dao.IComplaintV1ServiceDao;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绫昏〃杩帮細
- * add by 鍚村鏂� at 2022-07-17 00:29:44 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 瀹樼綉锛歨ttp://www.homecommunity.cn
- * 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
- * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
- */
-@Service("complaintV1ServiceDaoImpl")
-public class ComplaintV1ServiceDaoImpl extends BaseServiceDao implements IComplaintV1ServiceDao {
-
- private static Logger logger = LoggerFactory.getLogger(ComplaintV1ServiceDaoImpl.class);
-
-
-
-
-
- /**
- * 淇濆瓨鎶曡瘔寤鸿淇℃伅 鍒� instance
- * @param info bId 淇℃伅
- * @throws DAOException DAO寮傚父
- */
- @Override
- public int saveComplaintInfo(Map info) throws DAOException {
- logger.debug("淇濆瓨 saveComplaintInfo 鍏ュ弬 info : {}",info);
-
- int saveFlag = sqlSessionTemplate.insert("complaintV1ServiceDaoImpl.saveComplaintInfo",info);
-
- return saveFlag;
- }
-
-
- /**
- * 鏌ヨ鎶曡瘔寤鸿淇℃伅锛坕nstance锛�
- * @param info bId 淇℃伅
- * @return List<Map>
- * @throws DAOException DAO寮傚父
- */
- @Override
- public List<Map> getComplaintInfo(Map info) throws DAOException {
- logger.debug("鏌ヨ getComplaintInfo 鍏ュ弬 info : {}",info);
-
- List<Map> businessComplaintInfos = sqlSessionTemplate.selectList("complaintV1ServiceDaoImpl.getComplaintInfo",info);
-
- return businessComplaintInfos;
- }
-
-
- /**
- * 淇敼鎶曡瘔寤鸿淇℃伅
- * @param info 淇敼淇℃伅
- * @throws DAOException DAO寮傚父
- */
- @Override
- public int updateComplaintInfo(Map info) throws DAOException {
- logger.debug("淇敼 updateComplaintInfo 鍏ュ弬 info : {}",info);
-
- int saveFlag = sqlSessionTemplate.update("complaintV1ServiceDaoImpl.updateComplaintInfo",info);
-
- return saveFlag;
- }
-
- /**
- * 鏌ヨ鎶曡瘔寤鸿鏁伴噺
- * @param info 鎶曡瘔寤鸿淇℃伅
- * @return 鎶曡瘔寤鸿鏁伴噺
- */
- @Override
- public int queryComplaintsCount(Map info) {
- logger.debug("鏌ヨ queryComplaintsCount 鍏ュ弬 info : {}",info);
-
- List<Map> businessComplaintInfos = sqlSessionTemplate.selectList("complaintV1ServiceDaoImpl.queryComplaintsCount", info);
- if (businessComplaintInfos.size() < 1) {
- return 0;
- }
-
- return Integer.parseInt(businessComplaintInfos.get(0).get("count").toString());
- }
-
- @Override
- public List<Map> queryComplaintCountByOwnerTels(Map info) {
- logger.debug("鏌ヨ queryComplaintCountByOwnerTels 鍏ュ弬 info : {}",info);
-
- List<Map> result = sqlSessionTemplate.selectList("complaintV1ServiceDaoImpl.queryComplaintCountByOwnerTels", info);
- return result;
- }
-
-
-}
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/ComplaintV1InnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/ComplaintV1InnerServiceSMOImpl.java
deleted file mode 100644
index 7e37e7b..0000000
--- a/service-community/src/main/java/com/java110/community/smo/impl/ComplaintV1InnerServiceSMOImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.smo.impl;
-
-
-import com.java110.community.dao.IComplaintV1ServiceDao;
-import com.java110.intf.community.IComplaintV1InnerServiceSMO;
-import com.java110.dto.complaint.ComplaintDto;
-import com.java110.po.complaint.ComplaintPo;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
-import com.java110.dto.PageDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绫昏〃杩帮細 鏈嶅姟涔嬪墠璋冪敤鐨勬帴鍙ｅ疄鐜扮被锛屼笉瀵瑰鎻愪緵鎺ュ彛鑳藉姏 鍙敤浜庢帴鍙ｅ缓璋冪敤
- * add by 鍚村鏂� at 2022-07-17 00:29:44 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 瀹樼綉锛歨ttp://www.homecommunity.cn
- * 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
- * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
- */
-@RestController
-public class ComplaintV1InnerServiceSMOImpl extends BaseServiceSMO implements IComplaintV1InnerServiceSMO {
-
- @Autowired
- private IComplaintV1ServiceDao complaintV1ServiceDaoImpl;
-
-
- @Override
- public int saveComplaint(@RequestBody ComplaintPo complaintPo) {
- int saveFlag = complaintV1ServiceDaoImpl.saveComplaintInfo(BeanConvertUtil.beanCovertMap(complaintPo));
- return saveFlag;
- }
-
- @Override
- public int updateComplaint(@RequestBody ComplaintPo complaintPo) {
- int saveFlag = complaintV1ServiceDaoImpl.updateComplaintInfo(BeanConvertUtil.beanCovertMap(complaintPo));
- return saveFlag;
- }
-
- @Override
- public int deleteComplaint(@RequestBody ComplaintPo complaintPo) {
- complaintPo.setStatusCd("1");
- int saveFlag = complaintV1ServiceDaoImpl.updateComplaintInfo(BeanConvertUtil.beanCovertMap(complaintPo));
- return saveFlag;
- }
-
- @Override
- public List<ComplaintDto> queryComplaints(@RequestBody ComplaintDto complaintDto) {
-
- //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
-
- int page = complaintDto.getPage();
-
- if (page != PageDto.DEFAULT_PAGE) {
- complaintDto.setPage((page - 1) * complaintDto.getRow());
- }
-
- List<ComplaintDto> complaints = BeanConvertUtil.covertBeanList(complaintV1ServiceDaoImpl.getComplaintInfo(BeanConvertUtil.beanCovertMap(complaintDto)), ComplaintDto.class);
-
- return complaints;
- }
-
-
- @Override
- public int queryComplaintsCount(@RequestBody ComplaintDto complaintDto) {
- return complaintV1ServiceDaoImpl.queryComplaintsCount(BeanConvertUtil.beanCovertMap(complaintDto)); }
-
- @Override
- public List<Map> queryComplaintCountByOwnerTels(@RequestBody Map ownerTels) {
-
- List<Map> result = complaintV1ServiceDaoImpl.queryComplaintCountByOwnerTels(ownerTels);
- return result;
- }
-
-}
diff --git a/service-store/src/main/java/com/java110/store/cmd/complaint/AuditComplaintCmd.java b/service-store/src/main/java/com/java110/store/cmd/complaint/AuditComplaintCmd.java
index ef97b3f..7916d02 100644
--- a/service-store/src/main/java/com/java110/store/cmd/complaint/AuditComplaintCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/complaint/AuditComplaintCmd.java
@@ -7,7 +7,7 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.complaint.ComplaintDto;
import com.java110.intf.common.IComplaintUserInnerServiceSMO;
-import com.java110.intf.community.IComplaintV1InnerServiceSMO;
+import com.java110.intf.store.IComplaintV1InnerServiceSMO;
import com.java110.intf.store.IComplaintInnerServiceSMO;
import com.java110.po.complaint.ComplaintPo;
import com.java110.utils.constant.BusinessTypeConstant;
diff --git a/service-store/src/main/java/com/java110/store/dao/IComplaintV1ServiceDao.java b/service-store/src/main/java/com/java110/store/dao/IComplaintV1ServiceDao.java
index 399aba0..cf4972c 100644
--- a/service-store/src/main/java/com/java110/store/dao/IComplaintV1ServiceDao.java
+++ b/service-store/src/main/java/com/java110/store/dao/IComplaintV1ServiceDao.java
@@ -70,4 +70,5 @@
*/
int queryComplaintsCount(Map info);
+ List<Map> queryComplaintCountByOwnerTels(Map info);
}
diff --git a/service-store/src/main/java/com/java110/store/dao/impl/ComplaintV1ServiceDaoImpl.java b/service-store/src/main/java/com/java110/store/dao/impl/ComplaintV1ServiceDaoImpl.java
index b33afc8..4609a2f 100644
--- a/service-store/src/main/java/com/java110/store/dao/impl/ComplaintV1ServiceDaoImpl.java
+++ b/service-store/src/main/java/com/java110/store/dao/impl/ComplaintV1ServiceDaoImpl.java
@@ -108,5 +108,13 @@
return Integer.parseInt(businessComplaintInfos.get(0).get("count").toString());
}
+ @Override
+ public List<Map> queryComplaintCountByOwnerTels(Map info) {
+ logger.debug("鏌ヨ queryComplaintCountByOwnerTels 鍏ュ弬 info : {}",info);
+
+ List<Map> result = sqlSessionTemplate.selectList("complaintV1ServiceDaoImpl.queryComplaintCountByOwnerTels", info);
+ return result;
+ }
+
}
diff --git a/service-store/src/main/java/com/java110/store/smo/impl/ComplaintV1InnerServiceSMOImpl.java b/service-store/src/main/java/com/java110/store/smo/impl/ComplaintV1InnerServiceSMOImpl.java
index 6adbe68..bfcc4c0 100644
--- a/service-store/src/main/java/com/java110/store/smo/impl/ComplaintV1InnerServiceSMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/smo/impl/ComplaintV1InnerServiceSMOImpl.java
@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* 绫昏〃杩帮細 鏈嶅姟涔嬪墠璋冪敤鐨勬帴鍙ｅ疄鐜扮被锛屼笉瀵瑰鎻愪緵鎺ュ彛鑳藉姏 鍙敤浜庢帴鍙ｅ缓璋冪敤
@@ -86,4 +87,9 @@
public int queryComplaintsCount(@RequestBody ComplaintDto complaintDto) {
return complaintV1ServiceDaoImpl.queryComplaintsCount(BeanConvertUtil.beanCovertMap(complaintDto)); }
+ @Override
+ public List<Map> queryComplaintCountByOwnerTels(@RequestBody Map info) {
+ return complaintV1ServiceDaoImpl.queryComplaintCountByOwnerTels(info);
+ }
+
}
diff --git a/service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java b/service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java
index 6f55349..e3b5f1f 100644
--- a/service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java
@@ -1,7 +1,7 @@
package com.java110.user.bmo.owner.impl;
import com.java110.dto.owner.OwnerDto;
-import com.java110.intf.community.IComplaintV1InnerServiceSMO;
+import com.java110.intf.store.IComplaintV1InnerServiceSMO;
import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
import com.java110.intf.store.IContractInnerServiceSMO;
--
Gitblit v1.8.0