优化代码

java110-bean/src/main/java/com/java110/dto/reportInfoBackCity/ReportInfoBackCityDto.java

@@ -0,0 +1,118 @@
+package com.java110.dto.reportInfoBackCity;
+
+import com.java110.dto.PageDto;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 返省上报数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class ReportInfoBackCityDto extends PageDto implements Serializable {
+
+    private String backId;
+private String idCard;
+private String name;
+private String tel;
+private String remark;
+private String source;
+private String communityId;
+private String sourceCityName;
+private String userId;
+private String sourceCity;
+private String backTime;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getBackId() {
+        return backId;
+    }
+public void setBackId(String backId) {
+        this.backId = backId;
+    }
+public String getIdCard() {
+        return idCard;
+    }
+public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+public String getName() {
+        return name;
+    }
+public void setName(String name) {
+        this.name = name;
+    }
+public String getTel() {
+        return tel;
+    }
+public void setTel(String tel) {
+        this.tel = tel;
+    }
+public String getRemark() {
+        return remark;
+    }
+public void setRemark(String remark) {
+        this.remark = remark;
+    }
+public String getSource() {
+        return source;
+    }
+public void setSource(String source) {
+        this.source = source;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+public String getSourceCityName() {
+        return sourceCityName;
+    }
+public void setSourceCityName(String sourceCityName) {
+        this.sourceCityName = sourceCityName;
+    }
+public String getUserId() {
+        return userId;
+    }
+public void setUserId(String userId) {
+        this.userId = userId;
+    }
+public String getSourceCity() {
+        return sourceCity;
+    }
+public void setSourceCity(String sourceCity) {
+        this.sourceCity = sourceCity;
+    }
+public String getBackTime() {
+        return backTime;
+    }
+public void setBackTime(String backTime) {
+        this.backTime = backTime;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-bean/src/main/java/com/java110/dto/shopVipAccount/ShopUserAccountVipDto.java

@@ -0,0 +1,92 @@
+package com.java110.dto.shopVipAccount;
+
+import com.java110.dto.PageDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 用户账户信息 和vip信息
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class ShopUserAccountVipDto extends PageDto implements Serializable {
+
+
+    private String integral;
+    private String gold;
+    private String cash;
+    private String vipLevel;
+    private String shopId;
+    private String userId;
+    private String userName;
+    private String tel;
+
+
+    public String getIntegral() {
+        return integral;
+    }
+
+    public void setIntegral(String integral) {
+        this.integral = integral;
+    }
+
+    public String getGold() {
+        return gold;
+    }
+
+    public void setGold(String gold) {
+        this.gold = gold;
+    }
+
+    public String getCash() {
+        return cash;
+    }
+
+    public void setCash(String cash) {
+        this.cash = cash;
+    }
+
+    public String getVipLevel() {
+        return vipLevel;
+    }
+
+    public void setVipLevel(String vipLevel) {
+        this.vipLevel = vipLevel;
+    }
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+}

java110-bean/src/main/java/com/java110/dto/shopVipAccountDetail/ShopVipAccountDetailDto.java

@@ -1,4 +1,4 @@
-package com.java110.dto.shopVipAccountDetail;
+package com.java110.dto.shopVipAccount;
 
 import com.java110.dto.PageDto;
 import java.io.Serializable;

java110-bean/src/main/java/com/java110/po/reportInfoBackCity/ReportInfoBackCityPo.java

@@ -0,0 +1,95 @@
+package com.java110.po.reportInfoBackCity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ReportInfoBackCityPo implements Serializable {
+
+    private String backId;
+private String idCard;
+private String name;
+private String tel;
+private String remark;
+private String statusCd = "0";
+private String source;
+private String communityId;
+private String sourceCityName;
+private String userId;
+private String sourceCity;
+private String backTime;
+public String getBackId() {
+        return backId;
+    }
+public void setBackId(String backId) {
+        this.backId = backId;
+    }
+public String getIdCard() {
+        return idCard;
+    }
+public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+public String getName() {
+        return name;
+    }
+public void setName(String name) {
+        this.name = name;
+    }
+public String getTel() {
+        return tel;
+    }
+public void setTel(String tel) {
+        this.tel = tel;
+    }
+public String getRemark() {
+        return remark;
+    }
+public void setRemark(String remark) {
+        this.remark = remark;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getSource() {
+        return source;
+    }
+public void setSource(String source) {
+        this.source = source;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+public String getSourceCityName() {
+        return sourceCityName;
+    }
+public void setSourceCityName(String sourceCityName) {
+        this.sourceCityName = sourceCityName;
+    }
+public String getUserId() {
+        return userId;
+    }
+public void setUserId(String userId) {
+        this.userId = userId;
+    }
+public String getSourceCity() {
+        return sourceCity;
+    }
+public void setSourceCity(String sourceCity) {
+        this.sourceCity = sourceCity;
+    }
+public String getBackTime() {
+        return backTime;
+    }
+public void setBackTime(String backTime) {
+        this.backTime = backTime;
+    }
+
+
+
+}

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -211,8 +211,12 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_bobjId = "77";
     public static final String CODE_PREFIX_smsId = "78";
     public static final String CODE_PREFIX_adsId = "78";
+<<<<<<< HEAD
     public static final String CODE_PREFIX_userAnId = "88";
     public static final String CODE_PREFIX_anValueId = "68";
+=======
+    public static final String CODE_PREFIX_backId = "78";
+>>>>>>> 7e621d56f2efc96f42a47ba3e5a62af69c6dd043
 
 
 

java110-db/src/main/resources/mapper/report/ReportInfoBackCityServiceDaoImplMapper.xml

@@ -0,0 +1,160 @@
+<?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="reportInfoBackCityServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存返省上报信息 add by wuxw 2018-07-03 -->
+    <insert id="saveReportInfoBackCityInfo" parameterType="Map">
+        insert into report_info_back_city(
+back_id,id_card,name,tel,remark,source,community_id,source_city_name,user_id,source_city,back_time
+) values (
+#{backId},#{idCard},#{name},#{tel},#{remark},#{source},#{communityId},#{sourceCityName},#{userId},#{sourceCity},#{backTime}
+)
+    </insert>
+
+
+
+    <!-- 查询返省上报信息 add by wuxw 2018-07-03 -->
+    <select id="getReportInfoBackCityInfo" parameterType="Map" resultType="Map">
+        select  t.back_id,t.back_id backId,t.id_card,t.id_card idCard,t.name,t.tel,t.remark,t.status_cd,t.status_cd statusCd,t.source,t.community_id,t.community_id communityId,t.source_city_name,t.source_city_name sourceCityName,t.user_id,t.user_id userId,t.source_city,t.source_city sourceCity,t.back_time,t.back_time backTime 
+from report_info_back_city t 
+where 1 =1 
+<if test="backId !=null and backId != ''">
+   and t.back_id= #{backId}
+</if> 
+<if test="idCard !=null and idCard != ''">
+   and t.id_card= #{idCard}
+</if> 
+<if test="name !=null and name != ''">
+   and t.name= #{name}
+</if> 
+<if test="tel !=null and tel != ''">
+   and t.tel= #{tel}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="source !=null and source != ''">
+   and t.source= #{source}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="sourceCityName !=null and sourceCityName != ''">
+   and t.source_city_name= #{sourceCityName}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="sourceCity !=null and sourceCity != ''">
+   and t.source_city= #{sourceCity}
+</if> 
+<if test="backTime !=null and backTime != ''">
+   and t.back_time= #{backTime}
+</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="updateReportInfoBackCityInfo" parameterType="Map">
+        update  report_info_back_city t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="idCard !=null and idCard != ''">
+, t.id_card= #{idCard}
+</if> 
+<if test="name !=null and name != ''">
+, t.name= #{name}
+</if> 
+<if test="tel !=null and tel != ''">
+, t.tel= #{tel}
+</if> 
+<if test="remark !=null and remark != ''">
+, t.remark= #{remark}
+</if> 
+<if test="source !=null and source != ''">
+, t.source= #{source}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="sourceCityName !=null and sourceCityName != ''">
+, t.source_city_name= #{sourceCityName}
+</if> 
+<if test="userId !=null and userId != ''">
+, t.user_id= #{userId}
+</if> 
+<if test="sourceCity !=null and sourceCity != ''">
+, t.source_city= #{sourceCity}
+</if> 
+<if test="backTime !=null and backTime != ''">
+, t.back_time= #{backTime}
+</if> 
+ where 1=1 <if test="backId !=null and backId != ''">
+and t.back_id= #{backId}
+</if> 
+
+    </update>
+
+    <!-- 查询返省上报数量 add by wuxw 2018-07-03 -->
+     <select id="queryReportInfoBackCitysCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from report_info_back_city t 
+where 1 =1 
+<if test="backId !=null and backId != ''">
+   and t.back_id= #{backId}
+</if> 
+<if test="idCard !=null and idCard != ''">
+   and t.id_card= #{idCard}
+</if> 
+<if test="name !=null and name != ''">
+   and t.name= #{name}
+</if> 
+<if test="tel !=null and tel != ''">
+   and t.tel= #{tel}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="source !=null and source != ''">
+   and t.source= #{source}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="sourceCityName !=null and sourceCityName != ''">
+   and t.source_city_name= #{sourceCityName}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="sourceCity !=null and sourceCity != ''">
+   and t.source_city= #{sourceCity}
+</if> 
+<if test="backTime !=null and backTime != ''">
+   and t.back_time= #{backTime}
+</if> 
+
+
+     </select>
+
+</mapper>

java110-generator/src/main/resources/newBack/template_1.json

@@ -1,5 +1,6 @@
 {
   "autoMove": true,
+<<<<<<< HEAD
   "id": "anValueId",
   "name": "reportInfoAnswerValue",
   "desc": "批量操作日志详情",
@@ -16,6 +17,27 @@
     "valueContent": "value_content",
     "communityId": "community_id",
     "createTime": "create_time",
+=======
+  "id": "backId",
+  "name": "reportInfoBackCity",
+  "desc": "返省上报",
+  "shareParam": "communityId",
+  "shareColumn": "community_id",
+  "shareName": "report",
+  "tableName": "report_info_back_city",
+  "param": {
+    "backId": "back_id",
+    "name": "name",
+    "communityId": "community_id",
+    "idCard": "id_card",
+    "tel": "tel",
+    "source": "source",
+    "sourceCity": "source_city",
+    "sourceCityName": "source_city_name",
+    "backTime": "back_time",
+    "userId": "user_id",
+    "remark": "remark",
+>>>>>>> 7e621d56f2efc96f42a47ba3e5a62af69c6dd043
     "statusCd": "status_cd"
   },
   "required": [

java110-interface/src/main/java/com/java110/intf/acct/IShopVipAccountDetailInnerServiceSMO.java

@@ -1,8 +1,7 @@
 package com.java110.intf.acct;
 
 import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.shopVipAccountDetail.ShopVipAccountDetailDto;
-import com.java110.po.accountDetail.AccountDetailPo;
+import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import com.java110.po.shopVipAccountDetail.ShopVipAccountDetailPo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;

java110-interface/src/main/java/com/java110/intf/report/IReportInfoBackCityInnerServiceSMO.java

@@ -0,0 +1,53 @@
+package com.java110.intf.report;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.reportInfoBackCity.ReportInfoBackCityDto;
+import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
+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;
+
+/**
+ * @ClassName IReportInfoBackCityInnerServiceSMO
+ * @Description 返省上报接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "report-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/reportInfoBackCityApi")
+public interface IReportInfoBackCityInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveReportInfoBackCity", method = RequestMethod.POST)
+    public int saveReportInfoBackCity(@RequestBody ReportInfoBackCityPo reportInfoBackCityPo);
+
+    @RequestMapping(value = "/updateReportInfoBackCity", method = RequestMethod.POST)
+    public int updateReportInfoBackCity(@RequestBody  ReportInfoBackCityPo reportInfoBackCityPo);
+
+    @RequestMapping(value = "/deleteReportInfoBackCity", method = RequestMethod.POST)
+    public int deleteReportInfoBackCity(@RequestBody  ReportInfoBackCityPo reportInfoBackCityPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param reportInfoBackCityDto 数据对象分享
+     * @return ReportInfoBackCityDto 对象数据
+     */
+    @RequestMapping(value = "/queryReportInfoBackCitys", method = RequestMethod.POST)
+    List<ReportInfoBackCityDto> queryReportInfoBackCitys(@RequestBody ReportInfoBackCityDto reportInfoBackCityDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param reportInfoBackCityDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryReportInfoBackCitysCount", method = RequestMethod.POST)
+    int queryReportInfoBackCitysCount(@RequestBody ReportInfoBackCityDto reportInfoBackCityDto);
+}

service-acct/src/main/java/com/java110/acct/api/ShopVipAccountApi.java

@@ -10,7 +10,7 @@ import com.java110.acct.bmo.shopVipAccountDetail.IGetShopVipAccountDetailBMO;
 import com.java110.acct.bmo.shopVipAccountDetail.ISaveShopVipAccountDetailBMO;
 import com.java110.acct.bmo.shopVipAccountDetail.IUpdateShopVipAccountDetailBMO;
 import com.java110.dto.shopVipAccount.ShopVipAccountDto;
-import com.java110.dto.shopVipAccountDetail.ShopVipAccountDetailDto;
+import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import com.java110.po.shopVipAccount.ShopVipAccountPo;
 import com.java110.po.shopVipAccountDetail.ShopVipAccountDetailPo;
 import com.java110.utils.util.Assert;
@@ -200,4 +200,25 @@ public class ShopVipAccountApi {
         shopVipAccountDetailDto.setShopId(shopId);
         return getShopVipAccountDetailBMOImpl.get(shopVipAccountDetailDto);
     }
+
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param shopId 小区ID
+     * @return
+     * @serviceCode /shopVipAccount/queryShopUserAccountAndVip
+     * @path /app/shopVipAccount/queryShopUserAccountAndVip
+     */
+    @RequestMapping(value = "/queryShopUserAccountAndVip", method = RequestMethod.GET)
+    public ResponseEntity<String> queryShopUserAccountAndVip(@RequestParam(value = "shopId") String shopId,
+                                                             @RequestParam(value = "userId") String userId,
+                                                            @RequestParam(value = "page") int page,
+                                                            @RequestParam(value = "row") int row) {
+        ShopVipAccountDetailDto shopVipAccountDetailDto = new ShopVipAccountDetailDto();
+        shopVipAccountDetailDto.setPage(page);
+        shopVipAccountDetailDto.setRow(row);
+        shopVipAccountDetailDto.setShopId(shopId);
+        return getShopVipAccountDetailBMOImpl.get(shopVipAccountDetailDto);
+    }
 }

service-acct/src/main/java/com/java110/acct/bmo/shopVipAccountDetail/IGetShopVipAccountDetailBMO.java

@@ -1,5 +1,5 @@
 package com.java110.acct.bmo.shopVipAccountDetail;
-import com.java110.dto.shopVipAccountDetail.ShopVipAccountDetailDto;
+import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import org.springframework.http.ResponseEntity;
 public interface IGetShopVipAccountDetailBMO {
 

service-acct/src/main/java/com/java110/acct/bmo/shopVipAccountDetail/impl/GetShopVipAccountDetailBMOImpl.java

@@ -1,7 +1,7 @@
 package com.java110.acct.bmo.shopVipAccountDetail.impl;
 
 import com.java110.acct.bmo.shopVipAccountDetail.IGetShopVipAccountDetailBMO;
-import com.java110.dto.shopVipAccountDetail.ShopVipAccountDetailDto;
+import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import com.java110.intf.acct.IShopVipAccountDetailInnerServiceSMO;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;

service-acct/src/main/java/com/java110/acct/smo/impl/ShopVipAccountDetailInnerServiceSMOImpl.java

@@ -4,7 +4,7 @@ package com.java110.acct.smo.impl;
 import com.java110.acct.dao.IShopVipAccountDetailServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
-import com.java110.dto.shopVipAccountDetail.ShopVipAccountDetailDto;
+import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import com.java110.intf.acct.IShopVipAccountDetailInnerServiceSMO;
 import com.java110.po.shopVipAccountDetail.ShopVipAccountDetailPo;
 import com.java110.utils.util.BeanConvertUtil;

service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java

@@ -0,0 +1,105 @@
+package com.java110.report.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.reportInfoBackCity.ReportInfoBackCityDto;
+import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
+import com.java110.report.bmo.reportInfoBackCity.IDeleteReportInfoBackCityBMO;
+import com.java110.report.bmo.reportInfoBackCity.IGetReportInfoBackCityBMO;
+import com.java110.report.bmo.reportInfoBackCity.ISaveReportInfoBackCityBMO;
+import com.java110.report.bmo.reportInfoBackCity.IUpdateReportInfoBackCityBMO;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequestMapping(value = "/reportInfoBackCity")
+public class ReportInfoBackCityApi {
+
+    @Autowired
+    private ISaveReportInfoBackCityBMO saveReportInfoBackCityBMOImpl;
+    @Autowired
+    private IUpdateReportInfoBackCityBMO updateReportInfoBackCityBMOImpl;
+    @Autowired
+    private IDeleteReportInfoBackCityBMO deleteReportInfoBackCityBMOImpl;
+
+    @Autowired
+    private IGetReportInfoBackCityBMO getReportInfoBackCityBMOImpl;
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /reportInfoBackCity/saveReportInfoBackCity
+     * @path /app/reportInfoBackCity/saveReportInfoBackCity
+     */
+    @RequestMapping(value = "/saveReportInfoBackCity", method = RequestMethod.POST)
+    public ResponseEntity<String> saveReportInfoBackCity(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+
+
+        ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
+        return saveReportInfoBackCityBMOImpl.save(reportInfoBackCityPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /reportInfoBackCity/updateReportInfoBackCity
+     * @path /app/reportInfoBackCity/updateReportInfoBackCity
+     */
+    @RequestMapping(value = "/updateReportInfoBackCity", method = RequestMethod.POST)
+    public ResponseEntity<String> updateReportInfoBackCity(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "backId", "backId不能为空");
+
+
+        ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
+        return updateReportInfoBackCityBMOImpl.update(reportInfoBackCityPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /reportInfoBackCity/deleteReportInfoBackCity
+     * @path /app/reportInfoBackCity/deleteReportInfoBackCity
+     */
+    @RequestMapping(value = "/deleteReportInfoBackCity", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteReportInfoBackCity(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "backId", "backId不能为空");
+
+
+        ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
+        return deleteReportInfoBackCityBMOImpl.delete(reportInfoBackCityPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param communityId 小区ID
+     * @return
+     * @serviceCode /reportInfoBackCity/queryReportInfoBackCity
+     * @path /app/reportInfoBackCity/queryReportInfoBackCity
+     */
+    @RequestMapping(value = "/queryReportInfoBackCity", method = RequestMethod.GET)
+    public ResponseEntity<String> queryReportInfoBackCity(@RequestParam(value = "communityId") String communityId,
+                                                          @RequestParam(value = "page") int page,
+                                                          @RequestParam(value = "row") int row) {
+        ReportInfoBackCityDto reportInfoBackCityDto = new ReportInfoBackCityDto();
+        reportInfoBackCityDto.setPage(page);
+        reportInfoBackCityDto.setRow(row);
+        reportInfoBackCityDto.setCommunityId(communityId);
+        return getReportInfoBackCityBMOImpl.get(reportInfoBackCityDto);
+    }
+}

service-report/src/main/java/com/java110/report/bmo/reportInfoBackCity/IDeleteReportInfoBackCityBMO.java

@@ -0,0 +1,17 @@
+package com.java110.report.bmo.reportInfoBackCity;
+import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteReportInfoBackCityBMO {
+
+
+    /**
+     * 修改返省上报
+     * add by wuxw
+     * @param reportInfoBackCityPo
+     * @return
+     */
+    ResponseEntity<String> delete(ReportInfoBackCityPo reportInfoBackCityPo);
+
+
+}

service-report/src/main/java/com/java110/report/bmo/reportInfoBackCity/IGetReportInfoBackCityBMO.java

@@ -0,0 +1,16 @@
+package com.java110.report.bmo.reportInfoBackCity;
+import com.java110.dto.reportInfoBackCity.ReportInfoBackCityDto;
+import org.springframework.http.ResponseEntity;
+public interface IGetReportInfoBackCityBMO {
+
+
+    /**
+     * 查询返省上报
+     * add by wuxw
+     * @param  reportInfoBackCityDto
+     * @return
+     */
+    ResponseEntity<String> get(ReportInfoBackCityDto reportInfoBackCityDto);
+
+
+}

service-report/src/main/java/com/java110/report/bmo/reportInfoBackCity/ISaveReportInfoBackCityBMO.java

@@ -0,0 +1,17 @@
+package com.java110.report.bmo.reportInfoBackCity;
+
+import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
+import org.springframework.http.ResponseEntity;
+public interface ISaveReportInfoBackCityBMO {
+
+
+    /**
+     * 添加返省上报
+     * add by wuxw
+     * @param reportInfoBackCityPo
+     * @return
+     */
+    ResponseEntity<String> save(ReportInfoBackCityPo reportInfoBackCityPo);
+
+
+}

service-report/src/main/java/com/java110/report/bmo/reportInfoBackCity/IUpdateReportInfoBackCityBMO.java

@@ -0,0 +1,17 @@
+package com.java110.report.bmo.reportInfoBackCity;
+import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateReportInfoBackCityBMO {
+
+
+    /**
+     * 修改返省上报
+     * add by wuxw
+     * @param reportInfoBackCityPo
+     * @return
+     */
+    ResponseEntity<String> update(ReportInfoBackCityPo reportInfoBackCityPo);
+
+
+}

service-report/src/main/java/com/java110/report/bmo/reportInfoBackCity/impl/DeleteReportInfoBackCityBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.report.bmo.reportInfoBackCity.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.report.IReportInfoBackCityInnerServiceSMO;
+import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
+import com.java110.report.bmo.reportInfoBackCity.IDeleteReportInfoBackCityBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("deleteReportInfoBackCityBMOImpl")
+public class DeleteReportInfoBackCityBMOImpl implements IDeleteReportInfoBackCityBMO {
+
+    @Autowired
+    private IReportInfoBackCityInnerServiceSMO reportInfoBackCityInnerServiceSMOImpl;
+
+    /**
+     * @param reportInfoBackCityPo 数据
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> delete(ReportInfoBackCityPo reportInfoBackCityPo) {
+
+        int flag = reportInfoBackCityInnerServiceSMOImpl.deleteReportInfoBackCity(reportInfoBackCityPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-report/src/main/java/com/java110/report/bmo/reportInfoBackCity/impl/GetReportInfoBackCityBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.report.bmo.reportInfoBackCity.impl;
+
+import com.java110.dto.reportInfoBackCity.ReportInfoBackCityDto;
+import com.java110.intf.report.IReportInfoBackCityInnerServiceSMO;
+import com.java110.report.bmo.reportInfoBackCity.IGetReportInfoBackCityBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("getReportInfoBackCityBMOImpl")
+public class GetReportInfoBackCityBMOImpl implements IGetReportInfoBackCityBMO {
+
+    @Autowired
+    private IReportInfoBackCityInnerServiceSMO reportInfoBackCityInnerServiceSMOImpl;
+
+    /**
+     * @param reportInfoBackCityDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(ReportInfoBackCityDto reportInfoBackCityDto) {
+
+
+        int count = reportInfoBackCityInnerServiceSMOImpl.queryReportInfoBackCitysCount(reportInfoBackCityDto);
+
+        List<ReportInfoBackCityDto> reportInfoBackCityDtos = null;
+        if (count > 0) {
+            reportInfoBackCityDtos = reportInfoBackCityInnerServiceSMOImpl.queryReportInfoBackCitys(reportInfoBackCityDto);
+        } else {
+            reportInfoBackCityDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportInfoBackCityDto.getRow()), count, reportInfoBackCityDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

service-report/src/main/java/com/java110/report/bmo/reportInfoBackCity/impl/SaveReportInfoBackCityBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.report.bmo.reportInfoBackCity.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.report.IReportInfoBackCityInnerServiceSMO;
+import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
+import com.java110.report.bmo.reportInfoBackCity.ISaveReportInfoBackCityBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("saveReportInfoBackCityBMOImpl")
+public class SaveReportInfoBackCityBMOImpl implements ISaveReportInfoBackCityBMO {
+
+    @Autowired
+    private IReportInfoBackCityInnerServiceSMO reportInfoBackCityInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param reportInfoBackCityPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(ReportInfoBackCityPo reportInfoBackCityPo) {
+
+        reportInfoBackCityPo.setBackId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_backId));
+        int flag = reportInfoBackCityInnerServiceSMOImpl.saveReportInfoBackCity(reportInfoBackCityPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-report/src/main/java/com/java110/report/bmo/reportInfoBackCity/impl/UpdateReportInfoBackCityBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.report.bmo.reportInfoBackCity.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.report.IReportInfoBackCityInnerServiceSMO;
+import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
+import com.java110.report.bmo.reportInfoBackCity.IUpdateReportInfoBackCityBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("updateReportInfoBackCityBMOImpl")
+public class UpdateReportInfoBackCityBMOImpl implements IUpdateReportInfoBackCityBMO {
+
+    @Autowired
+    private IReportInfoBackCityInnerServiceSMO reportInfoBackCityInnerServiceSMOImpl;
+
+    /**
+     * @param reportInfoBackCityPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> update(ReportInfoBackCityPo reportInfoBackCityPo) {
+
+        int flag = reportInfoBackCityInnerServiceSMOImpl.updateReportInfoBackCity(reportInfoBackCityPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-report/src/main/java/com/java110/report/dao/IReportInfoBackCityServiceDao.java

@@ -0,0 +1,61 @@
+package com.java110.report.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 返省上报组件内部之间使用，没有给外围系统提供服务能力
+ * 返省上报服务接口类，要求全部以字符串传输，方便微服务化
+ * 新建客户，修改客户，删除客户，查询客户等功能
+ *
+ * Created by wuxw on 2016/12/27.
+ */
+public interface IReportInfoBackCityServiceDao {
+
+
+    /**
+     * 保存 返省上报信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveReportInfoBackCityInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询返省上报信息（instance过程）
+     * 根据bId 查询返省上报信息
+     * @param info bId 信息
+     * @return 返省上报信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getReportInfoBackCityInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改返省上报信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateReportInfoBackCityInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询返省上报总数
+     *
+     * @param info 返省上报信息
+     * @return 返省上报数量
+     */
+    int queryReportInfoBackCitysCount(Map info);
+
+}

service-report/src/main/java/com/java110/report/dao/impl/ReportInfoBackCityServiceDaoImpl.java

@@ -0,0 +1,98 @@
+package com.java110.report.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.report.dao.IReportInfoBackCityServiceDao;
+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;
+
+/**
+ * 返省上报服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("reportInfoBackCityServiceDaoImpl")
+//@Transactional
+public class ReportInfoBackCityServiceDaoImpl extends BaseServiceDao implements IReportInfoBackCityServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(ReportInfoBackCityServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存返省上报信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveReportInfoBackCityInfo(Map info) throws DAOException {
+        logger.debug("保存返省上报信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("reportInfoBackCityServiceDaoImpl.saveReportInfoBackCityInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存返省上报信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+
+    /**
+     * 查询返省上报信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getReportInfoBackCityInfo(Map info) throws DAOException {
+        logger.debug("查询返省上报信息 入参 info : {}",info);
+
+        List<Map> businessReportInfoBackCityInfos = sqlSessionTemplate.selectList("reportInfoBackCityServiceDaoImpl.getReportInfoBackCityInfo",info);
+
+        return businessReportInfoBackCityInfos;
+    }
+
+
+    /**
+     * 修改返省上报信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateReportInfoBackCityInfo(Map info) throws DAOException {
+        logger.debug("修改返省上报信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("reportInfoBackCityServiceDaoImpl.updateReportInfoBackCityInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改返省上报信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询返省上报数量
+     * @param info 返省上报信息
+     * @return 返省上报数量
+     */
+    @Override
+    public int queryReportInfoBackCitysCount(Map info) {
+        logger.debug("查询返省上报数据 入参 info : {}",info);
+
+        List<Map> businessReportInfoBackCityInfos = sqlSessionTemplate.selectList("reportInfoBackCityServiceDaoImpl.queryReportInfoBackCitysCount", info);
+        if (businessReportInfoBackCityInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessReportInfoBackCityInfos.get(0).get("count").toString());
+    }
+
+
+}

service-report/src/main/java/com/java110/report/smo/impl/ReportInfoBackCityInnerServiceSMOImpl.java

@@ -0,0 +1,83 @@
+package com.java110.report.smo.impl;
+
+
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.reportInfoBackCity.ReportInfoBackCityDto;
+import com.java110.intf.report.IReportInfoBackCityInnerServiceSMO;
+import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
+import com.java110.report.dao.IReportInfoBackCityServiceDao;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName FloorInnerServiceSMOImpl
+ * @Description 返省上报内部服务实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class ReportInfoBackCityInnerServiceSMOImpl extends BaseServiceSMO implements IReportInfoBackCityInnerServiceSMO {
+
+    @Autowired
+    private IReportInfoBackCityServiceDao reportInfoBackCityServiceDaoImpl;
+
+
+    @Override
+    public int saveReportInfoBackCity(@RequestBody ReportInfoBackCityPo reportInfoBackCityPo) {
+        int saveFlag = 1;
+        reportInfoBackCityServiceDaoImpl.saveReportInfoBackCityInfo(BeanConvertUtil.beanCovertMap(reportInfoBackCityPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateReportInfoBackCity(@RequestBody ReportInfoBackCityPo reportInfoBackCityPo) {
+        int saveFlag = 1;
+        reportInfoBackCityServiceDaoImpl.updateReportInfoBackCityInfo(BeanConvertUtil.beanCovertMap(reportInfoBackCityPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteReportInfoBackCity(@RequestBody ReportInfoBackCityPo reportInfoBackCityPo) {
+        int saveFlag = 1;
+        reportInfoBackCityPo.setStatusCd("1");
+        reportInfoBackCityServiceDaoImpl.updateReportInfoBackCityInfo(BeanConvertUtil.beanCovertMap(reportInfoBackCityPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<ReportInfoBackCityDto> queryReportInfoBackCitys(@RequestBody ReportInfoBackCityDto reportInfoBackCityDto) {
+
+        //校验是否传了 分页信息
+
+        int page = reportInfoBackCityDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            reportInfoBackCityDto.setPage((page - 1) * reportInfoBackCityDto.getRow());
+        }
+
+        List<ReportInfoBackCityDto> reportInfoBackCitys = BeanConvertUtil.covertBeanList(reportInfoBackCityServiceDaoImpl.getReportInfoBackCityInfo(BeanConvertUtil.beanCovertMap(reportInfoBackCityDto)), ReportInfoBackCityDto.class);
+
+        return reportInfoBackCitys;
+    }
+
+
+    @Override
+    public int queryReportInfoBackCitysCount(@RequestBody ReportInfoBackCityDto reportInfoBackCityDto) {
+        return reportInfoBackCityServiceDaoImpl.queryReportInfoBackCitysCount(BeanConvertUtil.beanCovertMap(reportInfoBackCityDto));
+    }
+
+    public IReportInfoBackCityServiceDao getReportInfoBackCityServiceDaoImpl() {
+        return reportInfoBackCityServiceDaoImpl;
+    }
+
+    public void setReportInfoBackCityServiceDaoImpl(IReportInfoBackCityServiceDao reportInfoBackCityServiceDaoImpl) {
+        this.reportInfoBackCityServiceDaoImpl = reportInfoBackCityServiceDaoImpl;
+    }
+}