优化待办和已办一直的问题

java110-bean/src/main/java/com/java110/dto/RoomAttrDto.java

@@ -18,6 +18,9 @@ public class RoomAttrDto extends PageDto implements Serializable {
     private String specCd;
     private String value;
     private String roomId;
+    private String valueName;
+    private String specName;
+    private String listShow;
 
 
     private Date createTime;
@@ -73,4 +76,28 @@ public class RoomAttrDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getValueName() {
+        return valueName;
+    }
+
+    public void setValueName(String valueName) {
+        this.valueName = valueName;
+    }
+
+    public String getSpecName() {
+        return specName;
+    }
+
+    public void setSpecName(String specName) {
+        this.specName = specName;
+    }
+
+    public String getListShow() {
+        return listShow;
+    }
+
+    public void setListShow(String listShow) {
+        this.listShow = listShow;
+    }
 }

java110-bean/src/main/java/com/java110/dto/attrValue/AttrValueDto.java

@@ -0,0 +1,86 @@
+package com.java110.dto.attrValue;
+
+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 AttrValueDto extends PageDto implements Serializable {
+
+    private String valueId;
+    private String valueName;
+    private String valueShow;
+    private String specCd;
+    private String value;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getValueId() {
+        return valueId;
+    }
+
+    public void setValueId(String valueId) {
+        this.valueId = valueId;
+    }
+
+    public String getValueName() {
+        return valueName;
+    }
+
+    public void setValueName(String valueName) {
+        this.valueName = valueName;
+    }
+
+    public String getValueShow() {
+        return valueShow;
+    }
+
+    public void setValueShow(String valueShow) {
+        this.valueShow = valueShow;
+    }
+
+    public String getSpecCd() {
+        return specCd;
+    }
+
+    public void setSpecCd(String specCd) {
+        this.specCd = specCd;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+
+    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/po/attrValue/AttrValuePo.java

@@ -0,0 +1,53 @@
+package com.java110.po.attrValue;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class AttrValuePo implements Serializable {
+
+    private String valueId;
+private String valueName;
+private String valueShow;
+private String specCd;
+private String statusCd = "0";
+private String value;
+public String getValueId() {
+        return valueId;
+    }
+public void setValueId(String valueId) {
+        this.valueId = valueId;
+    }
+public String getValueName() {
+        return valueName;
+    }
+public void setValueName(String valueName) {
+        this.valueName = valueName;
+    }
+public String getValueShow() {
+        return valueShow;
+    }
+public void setValueShow(String valueShow) {
+        this.valueShow = valueShow;
+    }
+public String getSpecCd() {
+        return specCd;
+    }
+public void setSpecCd(String specCd) {
+        this.specCd = specCd;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getValue() {
+        return value;
+    }
+public void setValue(String value) {
+        this.value = value;
+    }
+
+
+
+}

java110-db/src/main/resources/mapper/common/AttrValueServiceDaoImplMapper.xml

@@ -0,0 +1,102 @@
+<?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="attrValueServiceDaoImpl">
+
+
+    <!-- 保存属性值信息 add by wuxw 2018-07-03 -->
+    <insert id="saveAttrValueInfo" parameterType="Map">
+        insert into attr_value(
+        value_id,value_name,value_show,spec_cd,value
+        ) values (
+        #{valueId},#{valueName},#{valueShow},#{specCd},#{value}
+        )
+    </insert>
+
+
+    <!-- 查询属性值信息 add by wuxw 2018-07-03 -->
+    <select id="getAttrValueInfo" parameterType="Map" resultType="Map">
+        select t.value_id,t.value_id valueId,t.value_name,t.value_name valueName,t.value_show,t.value_show
+        valueShow,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.value
+        from attr_value t
+        where 1 =1
+        <if test="valueId !=null and valueId != ''">
+            and t.value_id= #{valueId}
+        </if>
+        <if test="valueName !=null and valueName != ''">
+            and t.value_name= #{valueName}
+        </if>
+        <if test="valueShow !=null and valueShow != ''">
+            and t.value_show= #{valueShow}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="value !=null and value != ''">
+            and t.value= #{value}
+        </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="updateAttrValueInfo" parameterType="Map">
+        update attr_value t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="valueName !=null and valueName != ''">
+            , t.value_name= #{valueName}
+        </if>
+        <if test="valueShow !=null and valueShow != ''">
+            , t.value_show= #{valueShow}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            , t.spec_cd= #{specCd}
+        </if>
+        <if test="value !=null and value != ''">
+            , t.value= #{value}
+        </if>
+        where 1=1
+        <if test="valueId !=null and valueId != ''">
+            and t.value_id= #{valueId}
+        </if>
+
+    </update>
+
+    <!-- 查询属性值数量 add by wuxw 2018-07-03 -->
+    <select id="queryAttrValuesCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from attr_value t
+        where 1 =1
+        <if test="valueId !=null and valueId != ''">
+            and t.value_id= #{valueId}
+        </if>
+        <if test="valueName !=null and valueName != ''">
+            and t.value_name= #{valueName}
+        </if>
+        <if test="valueShow !=null and valueShow != ''">
+            and t.value_show= #{valueShow}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
+
+
+    </select>
+
+</mapper>

java110-db/src/main/resources/mapper/community/RoomAttrServiceDaoImplMapper.xml

@@ -70,8 +70,15 @@
     <!-- 查询小区房屋属性信息 add by wuxw 2018-07-03 -->
     <select id="getRoomAttrInfo" parameterType="Map" resultType="Map">
         select t.attr_id,t.attr_id attrId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id
-        bId,t.value,t.room_id,t.room_id roomId
-        from building_room_attr t
+        bId,t.value,t.room_id,
+        t.room_id roomId,
+        s.spec_name specName,
+        v.value_name valueName,
+        s.list_show listShow
+        FROM
+        building_room_attr t
+        left join attr_spec s on t.spec_cd = s.spec_cd and s.status_cd = '0' and s.table_name = 'building_room_attr'
+        left join attr_value v on t.`value` = v.`value` and t.spec_cd = v.spec_cd and v.status_cd = '0'
         where 1 =1
         <if test="attrId !=null and attrId != ''">
             and t.attr_id= #{attrId}

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

@@ -1,22 +1,18 @@
 {
   "autoMove": true,
-  "id": "specCd",
-  "name": "attrSpec",
-  "desc": "属性规格表",
-  "shareParam": "specCd",
-  "shareColumn": "spec_cd",
+  "id": "valueId",
+  "name": "attrValue",
+  "desc": "属性值",
+  "shareParam": "valueId",
+  "shareColumn": "value_id",
   "shareName": "common",
-  "tableName": "attr_spec",
+  "tableName": "attr_value",
   "param": {
+    "valueId": "value_id",
     "specCd": "spec_cd",
-    "tableName": "table_name",
-    "specName": "spec_name",
-    "specHoldplace": "spec_holdplace",
-    "required": "required",
-    "specShow": "spec_show",
-    "specValueType": "spec_value_type",
-    "specType": "spec_type",
-    "listShow": "list_show",
+    "value": "value",
+    "valueName": "value_name",
+    "valueShow": "value_show",
     "statusCd": "status_cd"
   },
   "required": [
@@ -25,29 +21,14 @@
       "msg": "规格ID不能为空"
     },
     {
-      "code": "tableName",
-      "msg": "表名称不能为空"
+      "code": "value",
+      "msg": "值不能为空"
     },{
-      "code": "specName",
-      "msg": "规格名称不能为空"
+      "code": "valueName",
+      "msg": "值名称不能为空"
     },{
-      "code": "specHoldplace",
-      "msg": "提示不能为空"
-    },{
-      "code": "required",
-      "msg": "必填不能为空"
-    },{
-      "code": "specShow",
+      "code": "valueShow",
       "msg": "是否显示不能为空"
-    },{
-      "code": "specValueType",
-      "msg": "规格值不能为空"
-    },{
-      "code": "specType",
-      "msg": "规格类型不能为空"
-    },{
-      "code": "listShow",
-      "msg": "是否list中显示不能为空"
     }
   ]
 }

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

@@ -0,0 +1,53 @@
+{
+  "autoMove": true,
+  "id": "specCd",
+  "name": "attrSpec",
+  "desc": "属性规格表",
+  "shareParam": "specCd",
+  "shareColumn": "spec_cd",
+  "shareName": "common",
+  "tableName": "attr_spec",
+  "param": {
+    "specCd": "spec_cd",
+    "tableName": "table_name",
+    "specName": "spec_name",
+    "specHoldplace": "spec_holdplace",
+    "required": "required",
+    "specShow": "spec_show",
+    "specValueType": "spec_value_type",
+    "specType": "spec_type",
+    "listShow": "list_show",
+    "statusCd": "status_cd"
+  },
+  "required": [
+    {
+      "code": "specCd",
+      "msg": "规格ID不能为空"
+    },
+    {
+      "code": "tableName",
+      "msg": "表名称不能为空"
+    },{
+      "code": "specName",
+      "msg": "规格名称不能为空"
+    },{
+      "code": "specHoldplace",
+      "msg": "提示不能为空"
+    },{
+      "code": "required",
+      "msg": "必填不能为空"
+    },{
+      "code": "specShow",
+      "msg": "是否显示不能为空"
+    },{
+      "code": "specValueType",
+      "msg": "规格值不能为空"
+    },{
+      "code": "specType",
+      "msg": "规格类型不能为空"
+    },{
+      "code": "listShow",
+      "msg": "是否list中显示不能为空"
+    }
+  ]
+}

java110-interface/src/main/java/com/java110/intf/common/IAttrValueInnerServiceSMO.java

@@ -0,0 +1,52 @@
+package com.java110.intf.common;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.attrValue.AttrValueDto;
+import com.java110.po.attrValue.AttrValuePo;
+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 IAttrValueInnerServiceSMO
+ * @Description 属性值接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/attrValueApi")
+public interface IAttrValueInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveAttrValue", method = RequestMethod.POST)
+    public int saveAttrValue(@RequestBody AttrValuePo attrValuePo);
+
+    @RequestMapping(value = "/updateAttrValue", method = RequestMethod.POST)
+    public int updateAttrValue(@RequestBody AttrValuePo attrValuePo);
+
+    @RequestMapping(value = "/deleteAttrValue", method = RequestMethod.POST)
+    public int deleteAttrValue(@RequestBody AttrValuePo attrValuePo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     * @param attrValueDto 数据对象分享
+     * @return AttrValueDto 对象数据
+     */
+    @RequestMapping(value = "/queryAttrValues", method = RequestMethod.POST)
+    List<AttrValueDto> queryAttrValues(@RequestBody AttrValueDto attrValueDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param attrValueDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryAttrValuesCount", method = RequestMethod.POST)
+    int queryAttrValuesCount(@RequestBody AttrValueDto attrValueDto);
+}

service-common/src/main/java/com/java110/common/api/AttrValueApi.java

@@ -0,0 +1,107 @@
+package com.java110.common.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.bmo.attrValue.IDeleteAttrValueBMO;
+import com.java110.common.bmo.attrValue.IGetAttrValueBMO;
+import com.java110.common.bmo.attrValue.ISaveAttrValueBMO;
+import com.java110.common.bmo.attrValue.IUpdateAttrValueBMO;
+import com.java110.dto.attrValue.AttrValueDto;
+import com.java110.po.attrValue.AttrValuePo;
+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 = "/attrValue")
+public class AttrValueApi {
+
+    @Autowired
+    private ISaveAttrValueBMO saveAttrValueBMOImpl;
+    @Autowired
+    private IUpdateAttrValueBMO updateAttrValueBMOImpl;
+    @Autowired
+    private IDeleteAttrValueBMO deleteAttrValueBMOImpl;
+
+    @Autowired
+    private IGetAttrValueBMO getAttrValueBMOImpl;
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /attrValue/saveAttrValue
+     * @path /app/attrValue/saveAttrValue
+     */
+    @RequestMapping(value = "/saveAttrValue", method = RequestMethod.POST)
+    public ResponseEntity<String> saveAttrValue(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
+        Assert.hasKeyAndValue(reqJson, "value", "请求报文中未包含value");
+        Assert.hasKeyAndValue(reqJson, "valueName", "请求报文中未包含valueName");
+        Assert.hasKeyAndValue(reqJson, "valueShow", "请求报文中未包含valueShow");
+
+
+        AttrValuePo attrValuePo = BeanConvertUtil.covertBean(reqJson, AttrValuePo.class);
+        return saveAttrValueBMOImpl.save(attrValuePo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /attrValue/updateAttrValue
+     * @path /app/attrValue/updateAttrValue
+     */
+    @RequestMapping(value = "/updateAttrValue", method = RequestMethod.POST)
+    public ResponseEntity<String> updateAttrValue(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
+        Assert.hasKeyAndValue(reqJson, "value", "请求报文中未包含value");
+        Assert.hasKeyAndValue(reqJson, "valueName", "请求报文中未包含valueName");
+        Assert.hasKeyAndValue(reqJson, "valueShow", "请求报文中未包含valueShow");
+        Assert.hasKeyAndValue(reqJson, "valueId", "valueId不能为空");
+
+
+        AttrValuePo attrValuePo = BeanConvertUtil.covertBean(reqJson, AttrValuePo.class);
+        return updateAttrValueBMOImpl.update(attrValuePo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /attrValue/deleteAttrValue
+     * @path /app/attrValue/deleteAttrValue
+     */
+    @RequestMapping(value = "/deleteAttrValue", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteAttrValue(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "valueId", "valueId不能为空");
+
+
+        AttrValuePo attrValuePo = BeanConvertUtil.covertBean(reqJson, AttrValuePo.class);
+        return deleteAttrValueBMOImpl.delete(attrValuePo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param specCd 规格ID
+     * @return
+     * @serviceCode /attrValue/queryAttrValue
+     * @path /app/attrValue/queryAttrValue
+     */
+    @RequestMapping(value = "/queryAttrValue", method = RequestMethod.GET)
+    public ResponseEntity<String> queryAttrValue(@RequestParam(value = "specCd") String specCd) {
+        AttrValueDto attrValueDto = new AttrValueDto();
+        attrValueDto.setSpecCd(specCd);
+        return getAttrValueBMOImpl.get(attrValueDto);
+    }
+}

service-common/src/main/java/com/java110/common/bmo/attrValue/IDeleteAttrValueBMO.java

@@ -0,0 +1,19 @@
+package com.java110.common.bmo.attrValue;
+
+import com.java110.po.attrValue.AttrValuePo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteAttrValueBMO {
+
+
+    /**
+     * 修改属性值
+     * add by wuxw
+     *
+     * @param attrValuePo
+     * @return
+     */
+    ResponseEntity<String> delete(AttrValuePo attrValuePo);
+
+
+}

service-common/src/main/java/com/java110/common/bmo/attrValue/IGetAttrValueBMO.java

@@ -0,0 +1,16 @@
+package com.java110.common.bmo.attrValue;
+import com.java110.dto.attrValue.AttrValueDto;
+import org.springframework.http.ResponseEntity;
+public interface IGetAttrValueBMO {
+
+
+    /**
+     * 查询属性值
+     * add by wuxw
+     * @param  attrValueDto
+     * @return
+     */
+    ResponseEntity<String> get(AttrValueDto attrValueDto);
+
+
+}

service-common/src/main/java/com/java110/common/bmo/attrValue/ISaveAttrValueBMO.java

@@ -0,0 +1,19 @@
+package com.java110.common.bmo.attrValue;
+
+import com.java110.po.attrValue.AttrValuePo;
+import org.springframework.http.ResponseEntity;
+
+public interface ISaveAttrValueBMO {
+
+
+    /**
+     * 添加属性值
+     * add by wuxw
+     *
+     * @param attrValuePo
+     * @return
+     */
+    ResponseEntity<String> save(AttrValuePo attrValuePo);
+
+
+}

service-common/src/main/java/com/java110/common/bmo/attrValue/IUpdateAttrValueBMO.java

@@ -0,0 +1,19 @@
+package com.java110.common.bmo.attrValue;
+
+import com.java110.po.attrValue.AttrValuePo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateAttrValueBMO {
+
+
+    /**
+     * 修改属性值
+     * add by wuxw
+     *
+     * @param attrValuePo
+     * @return
+     */
+    ResponseEntity<String> update(AttrValuePo attrValuePo);
+
+
+}

service-common/src/main/java/com/java110/common/bmo/attrValue/impl/DeleteAttrValueBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.common.bmo.attrValue.impl;
+
+import com.java110.common.bmo.attrValue.IDeleteAttrValueBMO;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.common.IAttrValueInnerServiceSMO;
+import com.java110.po.attrValue.AttrValuePo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("deleteAttrValueBMOImpl")
+public class DeleteAttrValueBMOImpl implements IDeleteAttrValueBMO {
+
+    @Autowired
+    private IAttrValueInnerServiceSMO attrValueInnerServiceSMOImpl;
+
+    /**
+     * @param attrValuePo 数据
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> delete(AttrValuePo attrValuePo) {
+
+        int flag = attrValueInnerServiceSMOImpl.deleteAttrValue(attrValuePo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-common/src/main/java/com/java110/common/bmo/attrValue/impl/GetAttrValueBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.common.bmo.attrValue.impl;
+
+import com.java110.common.bmo.attrValue.IGetAttrValueBMO;
+import com.java110.dto.attrValue.AttrValueDto;
+import com.java110.intf.common.IAttrValueInnerServiceSMO;
+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("getAttrValueBMOImpl")
+public class GetAttrValueBMOImpl implements IGetAttrValueBMO {
+
+    @Autowired
+    private IAttrValueInnerServiceSMO attrValueInnerServiceSMOImpl;
+
+    /**
+     * @param attrValueDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(AttrValueDto attrValueDto) {
+
+
+        int count = attrValueInnerServiceSMOImpl.queryAttrValuesCount(attrValueDto);
+
+        List<AttrValueDto> attrValueDtos = null;
+        if (count > 0) {
+            attrValueDtos = attrValueInnerServiceSMOImpl.queryAttrValues(attrValueDto);
+        } else {
+            attrValueDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) attrValueDto.getRow()), count, attrValueDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

service-common/src/main/java/com/java110/common/bmo/attrValue/impl/SaveAttrValueBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.common.bmo.attrValue.impl;
+
+import com.java110.common.bmo.attrValue.ISaveAttrValueBMO;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.common.IAttrValueInnerServiceSMO;
+import com.java110.po.attrValue.AttrValuePo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("saveAttrValueBMOImpl")
+public class SaveAttrValueBMOImpl implements ISaveAttrValueBMO {
+
+    @Autowired
+    private IAttrValueInnerServiceSMO attrValueInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param attrValuePo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(AttrValuePo attrValuePo) {
+
+        attrValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+        int flag = attrValueInnerServiceSMOImpl.saveAttrValue(attrValuePo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-common/src/main/java/com/java110/common/bmo/attrValue/impl/UpdateAttrValueBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.common.bmo.attrValue.impl;
+
+import com.java110.common.bmo.attrValue.IUpdateAttrValueBMO;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.common.IAttrValueInnerServiceSMO;
+import com.java110.po.attrValue.AttrValuePo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("updateAttrValueBMOImpl")
+public class UpdateAttrValueBMOImpl implements IUpdateAttrValueBMO {
+
+    @Autowired
+    private IAttrValueInnerServiceSMO attrValueInnerServiceSMOImpl;
+
+    /**
+     * @param attrValuePo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> update(AttrValuePo attrValuePo) {
+
+        int flag = attrValueInnerServiceSMOImpl.updateAttrValue(attrValuePo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-common/src/main/java/com/java110/common/dao/IAttrValueServiceDao.java

@@ -0,0 +1,61 @@
+package com.java110.common.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 IAttrValueServiceDao {
+
+
+    /**
+     * 保存 属性值信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveAttrValueInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询属性值信息（instance过程）
+     * 根据bId 查询属性值信息
+     * @param info bId 信息
+     * @return 属性值信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getAttrValueInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改属性值信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateAttrValueInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询属性值总数
+     *
+     * @param info 属性值信息
+     * @return 属性值数量
+     */
+    int queryAttrValuesCount(Map info);
+
+}

service-common/src/main/java/com/java110/common/dao/impl/AttrValueServiceDaoImpl.java

@@ -0,0 +1,98 @@
+package com.java110.common.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.common.dao.IAttrValueServiceDao;
+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("attrValueServiceDaoImpl")
+//@Transactional
+public class AttrValueServiceDaoImpl extends BaseServiceDao implements IAttrValueServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(AttrValueServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存属性值信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveAttrValueInfo(Map info) throws DAOException {
+        logger.debug("保存属性值信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("attrValueServiceDaoImpl.saveAttrValueInfo",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> getAttrValueInfo(Map info) throws DAOException {
+        logger.debug("查询属性值信息 入参 info : {}",info);
+
+        List<Map> businessAttrValueInfos = sqlSessionTemplate.selectList("attrValueServiceDaoImpl.getAttrValueInfo",info);
+
+        return businessAttrValueInfos;
+    }
+
+
+    /**
+     * 修改属性值信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateAttrValueInfo(Map info) throws DAOException {
+        logger.debug("修改属性值信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("attrValueServiceDaoImpl.updateAttrValueInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改属性值信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询属性值数量
+     * @param info 属性值信息
+     * @return 属性值数量
+     */
+    @Override
+    public int queryAttrValuesCount(Map info) {
+        logger.debug("查询属性值数据 入参 info : {}",info);
+
+        List<Map> businessAttrValueInfos = sqlSessionTemplate.selectList("attrValueServiceDaoImpl.queryAttrValuesCount", info);
+        if (businessAttrValueInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessAttrValueInfos.get(0).get("count").toString());
+    }
+
+
+}

service-common/src/main/java/com/java110/common/smo/impl/AttrValueInnerServiceSMOImpl.java

@@ -0,0 +1,83 @@
+package com.java110.common.smo.impl;
+
+
+import com.java110.common.dao.IAttrValueServiceDao;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.attrValue.AttrValueDto;
+import com.java110.intf.common.IAttrValueInnerServiceSMO;
+import com.java110.po.attrValue.AttrValuePo;
+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 AttrValueInnerServiceSMOImpl extends BaseServiceSMO implements IAttrValueInnerServiceSMO {
+
+    @Autowired
+    private IAttrValueServiceDao attrValueServiceDaoImpl;
+
+
+    @Override
+    public int saveAttrValue(@RequestBody AttrValuePo attrValuePo) {
+        int saveFlag = 1;
+        attrValueServiceDaoImpl.saveAttrValueInfo(BeanConvertUtil.beanCovertMap(attrValuePo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateAttrValue(@RequestBody AttrValuePo attrValuePo) {
+        int saveFlag = 1;
+        attrValueServiceDaoImpl.updateAttrValueInfo(BeanConvertUtil.beanCovertMap(attrValuePo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteAttrValue(@RequestBody AttrValuePo attrValuePo) {
+        int saveFlag = 1;
+        attrValuePo.setStatusCd("1");
+        attrValueServiceDaoImpl.updateAttrValueInfo(BeanConvertUtil.beanCovertMap(attrValuePo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<AttrValueDto> queryAttrValues(@RequestBody AttrValueDto attrValueDto) {
+
+        //校验是否传了 分页信息
+
+        int page = attrValueDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            attrValueDto.setPage((page - 1) * attrValueDto.getRow());
+        }
+
+        List<AttrValueDto> attrValues = BeanConvertUtil.covertBeanList(attrValueServiceDaoImpl.getAttrValueInfo(BeanConvertUtil.beanCovertMap(attrValueDto)), AttrValueDto.class);
+
+        return attrValues;
+    }
+
+
+    @Override
+    public int queryAttrValuesCount(@RequestBody AttrValueDto attrValueDto) {
+        return attrValueServiceDaoImpl.queryAttrValuesCount(BeanConvertUtil.beanCovertMap(attrValueDto));
+    }
+
+    public IAttrValueServiceDao getAttrValueServiceDaoImpl() {
+        return attrValueServiceDaoImpl;
+    }
+
+    public void setAttrValueServiceDaoImpl(IAttrValueServiceDao attrValueServiceDaoImpl) {
+        this.attrValueServiceDaoImpl = attrValueServiceDaoImpl;
+    }
+}

service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java

@@ -194,7 +194,8 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
 
         HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(getWorkflowDto(user.getCommunityId()))
-                .taskAssignee(user.getUserId());
+                .taskAssignee(user.getUserId())
+                .finished();
         if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
             historicTaskInstanceQuery.taskName("complaint");
         } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
@@ -202,6 +203,7 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
         }
 
         Query query = historicTaskInstanceQuery;
+
         return query.count();
     }
 
@@ -215,7 +217,8 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
 
         HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(getWorkflowDto(user.getCommunityId()))
-                .taskAssignee(user.getUserId());
+                .taskAssignee(user.getUserId())
+                .finished();
         if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
             historicTaskInstanceQuery.taskName("complaint");
         } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {

service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java

@@ -222,7 +222,8 @@ public class GoodCollectionUserInnerServiceSMOImpl extends BaseServiceSMO implem
 
         HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(getWorkflowDto(user.getStoreId()))
-                .taskAssignee(user.getUserId());
+                .taskAssignee(user.getUserId())
+                .finished();
         if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
             historicTaskInstanceQuery.taskName("complaint");
         } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
@@ -243,7 +244,8 @@ public class GoodCollectionUserInnerServiceSMOImpl extends BaseServiceSMO implem
 
         HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(getWorkflowDto(user.getStoreId()))
-                .taskAssignee(user.getUserId());
+                .taskAssignee(user.getUserId())
+                .finished();
 //        if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
 //            historicTaskInstanceQuery.taskName("complaint");
 //        } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {

service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java

@@ -208,7 +208,8 @@ public class ResourceEntryStoreInnerServiceSMOImpl extends BaseServiceSMO implem
 
         HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(getWorkflowDto(user.getStoreId()))
-                .taskAssignee(user.getUserId());
+                .taskAssignee(user.getUserId())
+                .finished();
         if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
             historicTaskInstanceQuery.taskName("complaint");
         } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
@@ -229,7 +230,8 @@ public class ResourceEntryStoreInnerServiceSMOImpl extends BaseServiceSMO implem
 
         HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(getWorkflowDto(user.getStoreId()))
-                .taskAssignee(user.getUserId());
+                .taskAssignee(user.getUserId())
+                .finished();
 //        if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
 //            historicTaskInstanceQuery.taskName("complaint");
 //        } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {

service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java

@@ -14,6 +14,7 @@ import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -108,6 +109,9 @@ public class RoomInnerServiceSMOImpl extends BaseServiceSMO implements IRoomInne
             if (!roomAttrDto.getRoomId().equals(room.getRoomId())) {
                 continue;
             }
+            if (StringUtil.isEmpty(roomAttrDto.getValueName())) {
+                roomAttrDto.setValueName(roomAttrDto.getValue());
+            }
             tmpRoomAttrDtos.add(roomAttrDto);
         }
         room.setRoomAttrDto(tmpRoomAttrDtos);