Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/dto/systemInfo/SystemInfoDto.java

@@ -0,0 +1,118 @@
+package com.java110.dto.systemInfo;
+
+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 SystemInfoDto extends PageDto implements Serializable {
+
+    private String imgUrl;
+private String systemId;
+private String ownerTitle;
+private String defaultCommunityId;
+private String systemTitle;
+private String qqMapKey;
+private String subSystemTitle;
+private String companyName;
+private String mallUrl;
+private String logoUrl;
+private String propertyTitle;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+public String getSystemId() {
+        return systemId;
+    }
+public void setSystemId(String systemId) {
+        this.systemId = systemId;
+    }
+public String getOwnerTitle() {
+        return ownerTitle;
+    }
+public void setOwnerTitle(String ownerTitle) {
+        this.ownerTitle = ownerTitle;
+    }
+public String getDefaultCommunityId() {
+        return defaultCommunityId;
+    }
+public void setDefaultCommunityId(String defaultCommunityId) {
+        this.defaultCommunityId = defaultCommunityId;
+    }
+public String getSystemTitle() {
+        return systemTitle;
+    }
+public void setSystemTitle(String systemTitle) {
+        this.systemTitle = systemTitle;
+    }
+public String getQqMapKey() {
+        return qqMapKey;
+    }
+public void setQqMapKey(String qqMapKey) {
+        this.qqMapKey = qqMapKey;
+    }
+public String getSubSystemTitle() {
+        return subSystemTitle;
+    }
+public void setSubSystemTitle(String subSystemTitle) {
+        this.subSystemTitle = subSystemTitle;
+    }
+public String getCompanyName() {
+        return companyName;
+    }
+public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+public String getMallUrl() {
+        return mallUrl;
+    }
+public void setMallUrl(String mallUrl) {
+        this.mallUrl = mallUrl;
+    }
+public String getLogoUrl() {
+        return logoUrl;
+    }
+public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
+    }
+public String getPropertyTitle() {
+        return propertyTitle;
+    }
+public void setPropertyTitle(String propertyTitle) {
+        this.propertyTitle = propertyTitle;
+    }
+
+
+    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/systemInfo/SystemInfoPo.java

@@ -0,0 +1,117 @@
+/*
+ * 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.po.systemInfo;
+
+import java.io.Serializable;
+import java.util.Date;
+/**
+ * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
+ * add by 吴学文 at 2022-08-16 23:57:44 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+public class SystemInfoPo implements Serializable {
+
+    private String imgUrl;
+private String systemId;
+private String ownerTitle;
+private String defaultCommunityId;
+private String systemTitle;
+private String qqMapKey;
+private String subSystemTitle;
+private String companyName;
+private String mallUrl;
+private String statusCd = "0";
+private String logoUrl;
+private String propertyTitle;
+public String getImgUrl() {
+        return imgUrl;
+    }
+public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+public String getSystemId() {
+        return systemId;
+    }
+public void setSystemId(String systemId) {
+        this.systemId = systemId;
+    }
+public String getOwnerTitle() {
+        return ownerTitle;
+    }
+public void setOwnerTitle(String ownerTitle) {
+        this.ownerTitle = ownerTitle;
+    }
+public String getDefaultCommunityId() {
+        return defaultCommunityId;
+    }
+public void setDefaultCommunityId(String defaultCommunityId) {
+        this.defaultCommunityId = defaultCommunityId;
+    }
+public String getSystemTitle() {
+        return systemTitle;
+    }
+public void setSystemTitle(String systemTitle) {
+        this.systemTitle = systemTitle;
+    }
+public String getQqMapKey() {
+        return qqMapKey;
+    }
+public void setQqMapKey(String qqMapKey) {
+        this.qqMapKey = qqMapKey;
+    }
+public String getSubSystemTitle() {
+        return subSystemTitle;
+    }
+public void setSubSystemTitle(String subSystemTitle) {
+        this.subSystemTitle = subSystemTitle;
+    }
+public String getCompanyName() {
+        return companyName;
+    }
+public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+public String getMallUrl() {
+        return mallUrl;
+    }
+public void setMallUrl(String mallUrl) {
+        this.mallUrl = mallUrl;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getLogoUrl() {
+        return logoUrl;
+    }
+public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
+    }
+public String getPropertyTitle() {
+        return propertyTitle;
+    }
+public void setPropertyTitle(String propertyTitle) {
+        this.propertyTitle = propertyTitle;
+    }
+
+
+
+}

java110-db/src/main/resources/mapper/common/SystemInfoV1ServiceDaoImplMapper.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="systemInfoV1ServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存系统配置信息 add by wuxw 2018-07-03 -->
+    <insert id="saveSystemInfoInfo" parameterType="Map">
+        insert into system_info(
+img_url,system_id,owner_title,default_community_id,system_title,qq_map_key,sub_system_title,company_name,mall_url,logo_url,property_title
+) values (
+#{imgUrl},#{systemId},#{ownerTitle},#{defaultCommunityId},#{systemTitle},#{qqMapKey},#{subSystemTitle},#{companyName},#{mallUrl},#{logoUrl},#{propertyTitle}
+)
+    </insert>
+
+
+
+    <!-- 查询系统配置信息 add by wuxw 2018-07-03 -->
+    <select id="getSystemInfoInfo" parameterType="Map" resultType="Map">
+        select  t.img_url,t.img_url imgUrl,t.system_id,t.system_id systemId,t.owner_title,t.owner_title ownerTitle,t.default_community_id,t.default_community_id defaultCommunityId,t.system_title,t.system_title systemTitle,t.qq_map_key,t.qq_map_key qqMapKey,t.sub_system_title,t.sub_system_title subSystemTitle,t.company_name,t.company_name companyName,t.mall_url,t.mall_url mallUrl,t.status_cd,t.status_cd statusCd,t.logo_url,t.logo_url logoUrl,t.property_title,t.property_title propertyTitle 
+from system_info t 
+where 1 =1 
+<if test="imgUrl !=null and imgUrl != ''">
+   and t.img_url= #{imgUrl}
+</if> 
+<if test="systemId !=null and systemId != ''">
+   and t.system_id= #{systemId}
+</if> 
+<if test="ownerTitle !=null and ownerTitle != ''">
+   and t.owner_title= #{ownerTitle}
+</if> 
+<if test="defaultCommunityId !=null and defaultCommunityId != ''">
+   and t.default_community_id= #{defaultCommunityId}
+</if> 
+<if test="systemTitle !=null and systemTitle != ''">
+   and t.system_title= #{systemTitle}
+</if> 
+<if test="qqMapKey !=null and qqMapKey != ''">
+   and t.qq_map_key= #{qqMapKey}
+</if> 
+<if test="subSystemTitle !=null and subSystemTitle != ''">
+   and t.sub_system_title= #{subSystemTitle}
+</if> 
+<if test="companyName !=null and companyName != ''">
+   and t.company_name= #{companyName}
+</if> 
+<if test="mallUrl !=null and mallUrl != ''">
+   and t.mall_url= #{mallUrl}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="logoUrl !=null and logoUrl != ''">
+   and t.logo_url= #{logoUrl}
+</if> 
+<if test="propertyTitle !=null and propertyTitle != ''">
+   and t.property_title= #{propertyTitle}
+</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="updateSystemInfoInfo" parameterType="Map">
+        update  system_info t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="imgUrl !=null and imgUrl != ''">
+, t.img_url= #{imgUrl}
+</if> 
+<if test="ownerTitle !=null and ownerTitle != ''">
+, t.owner_title= #{ownerTitle}
+</if> 
+<if test="defaultCommunityId !=null and defaultCommunityId != ''">
+, t.default_community_id= #{defaultCommunityId}
+</if> 
+<if test="systemTitle !=null and systemTitle != ''">
+, t.system_title= #{systemTitle}
+</if> 
+<if test="qqMapKey !=null and qqMapKey != ''">
+, t.qq_map_key= #{qqMapKey}
+</if> 
+<if test="subSystemTitle !=null and subSystemTitle != ''">
+, t.sub_system_title= #{subSystemTitle}
+</if> 
+<if test="companyName !=null and companyName != ''">
+, t.company_name= #{companyName}
+</if> 
+<if test="mallUrl !=null and mallUrl != ''">
+, t.mall_url= #{mallUrl}
+</if> 
+<if test="logoUrl !=null and logoUrl != ''">
+, t.logo_url= #{logoUrl}
+</if> 
+<if test="propertyTitle !=null and propertyTitle != ''">
+, t.property_title= #{propertyTitle}
+</if> 
+ where 1=1 <if test="systemId !=null and systemId != ''">
+and t.system_id= #{systemId}
+</if> 
+
+    </update>
+
+    <!-- 查询系统配置数量 add by wuxw 2018-07-03 -->
+     <select id="querySystemInfosCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from system_info t 
+where 1 =1 
+<if test="imgUrl !=null and imgUrl != ''">
+   and t.img_url= #{imgUrl}
+</if> 
+<if test="systemId !=null and systemId != ''">
+   and t.system_id= #{systemId}
+</if> 
+<if test="ownerTitle !=null and ownerTitle != ''">
+   and t.owner_title= #{ownerTitle}
+</if> 
+<if test="defaultCommunityId !=null and defaultCommunityId != ''">
+   and t.default_community_id= #{defaultCommunityId}
+</if> 
+<if test="systemTitle !=null and systemTitle != ''">
+   and t.system_title= #{systemTitle}
+</if> 
+<if test="qqMapKey !=null and qqMapKey != ''">
+   and t.qq_map_key= #{qqMapKey}
+</if> 
+<if test="subSystemTitle !=null and subSystemTitle != ''">
+   and t.sub_system_title= #{subSystemTitle}
+</if> 
+<if test="companyName !=null and companyName != ''">
+   and t.company_name= #{companyName}
+</if> 
+<if test="mallUrl !=null and mallUrl != ''">
+   and t.mall_url= #{mallUrl}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="logoUrl !=null and logoUrl != ''">
+   and t.logo_url= #{logoUrl}
+</if> 
+<if test="propertyTitle !=null and propertyTitle != ''">
+   and t.property_title= #{propertyTitle}
+</if> 
+
+
+     </select>
+
+</mapper>

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

@@ -0,0 +1,68 @@
+/*
+ * 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.common;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.systemInfo.SystemInfoDto;
+import com.java110.po.systemInfo.SystemInfoPo;
+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;
+
+/**
+ * 类表述： 服务之前调用的接口类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-08-16 23:57:44 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/systemInfoV1Api")
+public interface ISystemInfoV1InnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveSystemInfo", method = RequestMethod.POST)
+    public int saveSystemInfo(@RequestBody SystemInfoPo systemInfoPo);
+
+    @RequestMapping(value = "/updateSystemInfo", method = RequestMethod.POST)
+    public int updateSystemInfo(@RequestBody SystemInfoPo systemInfoPo);
+
+    @RequestMapping(value = "/deleteSystemInfo", method = RequestMethod.POST)
+    public int deleteSystemInfo(@RequestBody SystemInfoPo systemInfoPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param systemInfoDto 数据对象分享
+     * @return SystemInfoDto 对象数据
+     */
+    @RequestMapping(value = "/querySystemInfos", method = RequestMethod.POST)
+    List<SystemInfoDto> querySystemInfos(@RequestBody SystemInfoDto systemInfoDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param systemInfoDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/querySystemInfosCount", method = RequestMethod.POST)
+    int querySystemInfosCount(@RequestBody SystemInfoDto systemInfoDto);
+}

service-common/src/main/java/com/java110/common/cmd/system/ListSystemInfoCmd.java

@@ -0,0 +1,80 @@
+/*
+ * 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.common.cmd.system;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.common.ISystemInfoV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.java110.dto.systemInfo.SystemInfoDto;
+import java.util.List;
+import java.util.ArrayList;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * 类表述：查询
+ * 服务编码：system.listSystemInfo
+ * 请求路劲：/app/system.ListSystemInfo
+ * add by 吴学文 at 2022-08-16 23:57:44 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "system.listSystemInfo")
+public class ListSystemInfoCmd extends Cmd {
+
+  private static Logger logger = LoggerFactory.getLogger(ListSystemInfoCmd.class);
+    @Autowired
+    private ISystemInfoV1InnerServiceSMO systemInfoV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+           SystemInfoDto systemInfoDto = BeanConvertUtil.covertBean(reqJson, SystemInfoDto.class);
+
+           int count = systemInfoV1InnerServiceSMOImpl.querySystemInfosCount(systemInfoDto);
+
+           List<SystemInfoDto> systemInfoDtos = null;
+
+           if (count > 0) {
+               systemInfoDtos = systemInfoV1InnerServiceSMOImpl.querySystemInfos(systemInfoDto);
+           } else {
+               systemInfoDtos = new ArrayList<>();
+           }
+
+           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, systemInfoDtos);
+
+           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+           cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+}

service-common/src/main/java/com/java110/common/cmd/system/UpdateSystemInfoCmd.java

@@ -0,0 +1,73 @@
+/*
+ * 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.common.cmd.system;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.common.ISystemInfoV1InnerServiceSMO;
+import com.java110.po.systemInfo.SystemInfoPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * 类表述：更新
+ * 服务编码：system.updateSystemInfo
+ * 请求路劲：/app/system.UpdateSystemInfo
+ * add by 吴学文 at 2022-08-16 23:57:44 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "system.updateSystemInfo")
+public class UpdateSystemInfoCmd extends Cmd {
+
+  private static Logger logger = LoggerFactory.getLogger(UpdateSystemInfoCmd.class);
+
+
+    @Autowired
+    private ISystemInfoV1InnerServiceSMO systemInfoV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "systemId", "systemId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+       SystemInfoPo systemInfoPo = BeanConvertUtil.covertBean(reqJson, SystemInfoPo.class);
+        int flag = systemInfoV1InnerServiceSMOImpl.updateSystemInfo(systemInfoPo);
+
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

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

@@ -0,0 +1,77 @@
+/*
+ * 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.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;
+
+/**
+ * 类表述：
+ * add by 吴学文 at 2022-08-16 23:57:44 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+public interface ISystemInfoV1ServiceDao {
+
+
+    /**
+     * 保存 系统配置信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveSystemInfoInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询系统配置信息（instance过程）
+     * 根据bId 查询系统配置信息
+     * @param info bId 信息
+     * @return 系统配置信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getSystemInfoInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改系统配置信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    int updateSystemInfoInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询系统配置总数
+     *
+     * @param info 系统配置信息
+     * @return 系统配置数量
+     */
+    int querySystemInfosCount(Map info);
+
+}

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

@@ -0,0 +1,112 @@
+/*
+ * 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.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.ISystemInfoV1ServiceDao;
+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-08-16 23:57:44 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@Service("systemInfoV1ServiceDaoImpl")
+public class SystemInfoV1ServiceDaoImpl extends BaseServiceDao implements ISystemInfoV1ServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(SystemInfoV1ServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存系统配置信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int saveSystemInfoInfo(Map info) throws DAOException {
+        logger.debug("保存 saveSystemInfoInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("systemInfoV1ServiceDaoImpl.saveSystemInfoInfo",info);
+
+        return saveFlag;
+    }
+
+
+    /**
+     * 查询系统配置信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getSystemInfoInfo(Map info) throws DAOException {
+        logger.debug("查询 getSystemInfoInfo 入参 info : {}",info);
+
+        List<Map> businessSystemInfoInfos = sqlSessionTemplate.selectList("systemInfoV1ServiceDaoImpl.getSystemInfoInfo",info);
+
+        return businessSystemInfoInfos;
+    }
+
+
+    /**
+     * 修改系统配置信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int updateSystemInfoInfo(Map info) throws DAOException {
+        logger.debug("修改 updateSystemInfoInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("systemInfoV1ServiceDaoImpl.updateSystemInfoInfo",info);
+
+        return saveFlag;
+    }
+
+     /**
+     * 查询系统配置数量
+     * @param info 系统配置信息
+     * @return 系统配置数量
+     */
+    @Override
+    public int querySystemInfosCount(Map info) {
+        logger.debug("查询 querySystemInfosCount 入参 info : {}",info);
+
+        List<Map> businessSystemInfoInfos = sqlSessionTemplate.selectList("systemInfoV1ServiceDaoImpl.querySystemInfosCount", info);
+        if (businessSystemInfoInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessSystemInfoInfos.get(0).get("count").toString());
+    }
+
+
+}

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

@@ -0,0 +1,89 @@
+/*
+ * 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.common.smo.impl;
+
+
+import com.java110.common.dao.ISystemInfoV1ServiceDao;
+import com.java110.intf.common.ISystemInfoV1InnerServiceSMO;
+import com.java110.dto.systemInfo.SystemInfoDto;
+import com.java110.po.systemInfo.SystemInfoPo;
+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.List;
+
+/**
+ * 类表述： 服务之前调用的接口实现类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-08-16 23:57:44 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@RestController
+public class SystemInfoV1InnerServiceSMOImpl extends BaseServiceSMO implements ISystemInfoV1InnerServiceSMO {
+
+    @Autowired
+    private ISystemInfoV1ServiceDao systemInfoV1ServiceDaoImpl;
+
+
+    @Override
+    public int saveSystemInfo(@RequestBody  SystemInfoPo systemInfoPo) {
+        int saveFlag = systemInfoV1ServiceDaoImpl.saveSystemInfoInfo(BeanConvertUtil.beanCovertMap(systemInfoPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateSystemInfo(@RequestBody  SystemInfoPo systemInfoPo) {
+        int saveFlag = systemInfoV1ServiceDaoImpl.updateSystemInfoInfo(BeanConvertUtil.beanCovertMap(systemInfoPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteSystemInfo(@RequestBody  SystemInfoPo systemInfoPo) {
+       systemInfoPo.setStatusCd("1");
+       int saveFlag = systemInfoV1ServiceDaoImpl.updateSystemInfoInfo(BeanConvertUtil.beanCovertMap(systemInfoPo));
+       return saveFlag;
+    }
+
+    @Override
+    public List<SystemInfoDto> querySystemInfos(@RequestBody  SystemInfoDto systemInfoDto) {
+
+        //校验是否传了 分页信息
+
+        int page = systemInfoDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            systemInfoDto.setPage((page - 1) * systemInfoDto.getRow());
+        }
+
+        List<SystemInfoDto> systemInfos = BeanConvertUtil.covertBeanList(systemInfoV1ServiceDaoImpl.getSystemInfoInfo(BeanConvertUtil.beanCovertMap(systemInfoDto)), SystemInfoDto.class);
+
+        return systemInfos;
+    }
+
+
+    @Override
+    public int querySystemInfosCount(@RequestBody SystemInfoDto systemInfoDto) {
+        return systemInfoV1ServiceDaoImpl.querySystemInfosCount(BeanConvertUtil.beanCovertMap(systemInfoDto));    }
+
+}

service-store/src/main/java/com/java110/store/cmd/store/SaveStoreInfoCmd.java

@@ -9,6 +9,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.account.AccountDto;
+import com.java110.dto.store.StoreDto;
 import com.java110.dto.workflow.WorkflowDto;
 import com.java110.intf.acct.IAccountInnerServiceSMO;
 import com.java110.intf.common.IWorkflowV1InnerServiceSMO;
@@ -287,6 +288,7 @@ public class SaveStoreInfoCmd extends Cmd {
                 businessStoreObj.put("mapY", "");
             }
             StorePo storePo = BeanConvertUtil.covertBean(businessStoreObj, StorePo.class);
+            storePo.setState(StoreDto.STATE_NORMAL);
             flag = storeV1InnerServiceSMOImpl.saveStore(storePo);
 
             if (flag < 1) {

service-user/src/main/java/com/java110/user/cmd/notepad/DeleteNotepadCmd.java

@@ -31,6 +31,7 @@ import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 /**
  * 类表述：删除
  * 服务编码：notepad.deleteNotepad
@@ -43,7 +44,7 @@ import org.slf4j.LoggerFactory;
  */
 @Java110Cmd(serviceCode = "notepad.deleteNotepad")
 public class DeleteNotepadCmd extends Cmd {
-  private static Logger logger = LoggerFactory.getLogger(DeleteNotepadCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(DeleteNotepadCmd.class);
 
     @Autowired
     private INotepadV1InnerServiceSMO notepadV1InnerServiceSMOImpl;
@@ -51,7 +52,7 @@ public class DeleteNotepadCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "noteId", "noteId不能为空");
-Assert.hasKeyAndValue(reqJson, "objId", "objId不能为空");
+        Assert.hasKeyAndValue(reqJson, "objId", "objId不能为空");
 
     }
 
@@ -59,7 +60,7 @@ Assert.hasKeyAndValue(reqJson, "objId", "objId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       NotepadPo notepadPo = BeanConvertUtil.covertBean(reqJson, NotepadPo.class);
+        NotepadPo notepadPo = BeanConvertUtil.covertBean(reqJson, NotepadPo.class);
         int flag = notepadV1InnerServiceSMOImpl.deleteNotepad(notepadPo);
 
         if (flag < 1) {

service-user/src/main/java/com/java110/user/cmd/notepad/SaveNotepadCmd.java

@@ -55,13 +55,13 @@ public class SaveNotepadCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "noteType", "请求报文中未包含noteType");
-Assert.hasKeyAndValue(reqJson, "title", "请求报文中未包含title");
-Assert.hasKeyAndValue(reqJson, "objType", "请求报文中未包含objType");
-Assert.hasKeyAndValue(reqJson, "objId", "请求报文中未包含objId");
-Assert.hasKeyAndValue(reqJson, "objName", "请求报文中未包含objName");
-Assert.hasKeyAndValue(reqJson, "createUserId", "请求报文中未包含createUserId");
-Assert.hasKeyAndValue(reqJson, "createUserName", "请求报文中未包含createUserName");
-Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
+        Assert.hasKeyAndValue(reqJson, "title", "请求报文中未包含title");
+        Assert.hasKeyAndValue(reqJson, "objType", "请求报文中未包含objType");
+        Assert.hasKeyAndValue(reqJson, "objId", "请求报文中未包含objId");
+        Assert.hasKeyAndValue(reqJson, "objName", "请求报文中未包含objName");
+        Assert.hasKeyAndValue(reqJson, "createUserId", "请求报文中未包含createUserId");
+        Assert.hasKeyAndValue(reqJson, "createUserName", "请求报文中未包含createUserName");
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
 
     }
 
@@ -69,7 +69,7 @@ Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       NotepadPo notepadPo = BeanConvertUtil.covertBean(reqJson, NotepadPo.class);
+        NotepadPo notepadPo = BeanConvertUtil.covertBean(reqJson, NotepadPo.class);
         notepadPo.setNoteId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = notepadV1InnerServiceSMOImpl.saveNotepad(notepadPo);
 

service-user/src/main/java/com/java110/user/cmd/notepad/UpdateNotepadCmd.java

@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "notepad.updateNotepad")
 public class UpdateNotepadCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(UpdateNotepadCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(UpdateNotepadCmd.class);
 
 
     @Autowired
@@ -55,7 +55,7 @@ public class UpdateNotepadCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "noteId", "noteId不能为空");
-Assert.hasKeyAndValue(reqJson, "objId", "objId不能为空");
+        Assert.hasKeyAndValue(reqJson, "objId", "objId不能为空");
 
     }
 
@@ -63,7 +63,7 @@ Assert.hasKeyAndValue(reqJson, "objId", "objId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       NotepadPo notepadPo = BeanConvertUtil.covertBean(reqJson, NotepadPo.class);
+        NotepadPo notepadPo = BeanConvertUtil.covertBean(reqJson, NotepadPo.class);
         int flag = notepadV1InnerServiceSMOImpl.updateNotepad(notepadPo);
 
         if (flag < 1) {