缴费接口提交

pom.xml

@@ -24,6 +24,7 @@
         <module>zoniot-common/zoniot-core-utils</module>
         <module>zoniot-rmcp</module>
         <module>zoniot-charge</module>
+        <module>zoniot-pay</module>
     </modules>
 
     <!--父工程打包方式为pom-->

zoniot-pay/pom.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>platform</artifactId>
+        <groupId>com.zcxk</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>zoniot-pay</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>zoniot-pay-web</module>
+        <module>zoniot-pay-core</module>
+        <module>zoniot-pay-xxljob-client</module>
+
+    </modules>
+    <properties>
+        <zoniot.version>1.0-SNAPSHOT</zoniot.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>com.zcxk</groupId>
+                <artifactId>zoniot-pay-core</artifactId>
+                <version>${zoniot.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>com.zcxk</groupId>
+            <artifactId>zoniot-core-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.zcxk</groupId>
+            <artifactId>zoniot-core-utils</artifactId>
+        </dependency>
+    </dependencies>
+</project>

zoniot-pay/zoniot-pay-core/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>zoniot-pay</artifactId>
+        <groupId>com.zcxk</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>zoniot-pay-core</artifactId>
+
+<dependencies>
+    <dependency>
+        <groupId>com.zcxk</groupId>
+        <artifactId>zoniot-pay-api</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.zcxk</groupId>
+        <artifactId>zoniot-core-mysql</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-core</artifactId>
+        <version>5.3.3.RELEASE</version>
+        <scope>compile</scope>
+    </dependency>
+</dependencies>
+</project>

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/AreaMapper.java

@@ -0,0 +1,21 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.AreaDto;
+import com.zcxk.rmcp.pay.dto.AreaRelevanceDto;
+import com.zcxk.rmcp.pay.entity.Area;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* Created by Mybatis Generator 2018/12/18
+*/
+@Mapper
+public interface AreaMapper {
+    List<Area> findByIds(@Param("ids") List<Integer> ids);
+
+    List<AreaDto> getAllArea();
+
+    List<AreaRelevanceDto> findByLevelType(@Param("levelType") Integer levelType);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/ChannelDeviceTypeUseMapper.java

@@ -0,0 +1,18 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.ChannelDeviceTypeUse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ChannelDeviceTypeUseMapper {
+
+
+    int insertList(@Param("channelDeviceTypeUses") List<ChannelDeviceTypeUse> channelDeviceTypeUses);
+
+
+    int deleteByChannelId(@Param("channelId") Integer channelId, @Param("updateBy") String updateBy);
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/ChannelMapper.java

@@ -0,0 +1,39 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.ChannelDeviceCountDto;
+import com.zcxk.rmcp.pay.dto.ChannelDto;
+import com.zcxk.rmcp.pay.entity.Channel;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ChannelMapper {
+    int insert(@Param("channel") Channel channel);
+
+    int insertSelective(@Param("channel") Channel channel);
+
+    int insertList(@Param("channels") List<Channel> channels);
+
+    int updateByPrimaryKeySelective(@Param("channel") Channel channel);
+
+    List<ChannelDeviceCountDto> getList(@Param("siteId") Integer siteId);
+
+    List<ChannelDeviceCountDto> getListByIds(@Param("siteId") Integer siteId, @Param("channelList") List<Channel> channelList);
+
+    List<ChannelDto> getSelect(@Param("siteId") Integer siteId);
+
+    List<Integer> getChannelBySiteId(@Param("siteId") Integer siteId);
+
+    List<ChannelDto> findList(@Param("name") String name);
+
+    int findByNameUnique(@Param("id") Integer id, @Param("channelName") String channelName);
+
+    List<Channel> getUserChannelList(@Param("siteId") Integer siteId, @Param("userId") Integer userId);
+
+    List<Channel> getChannelListBySiteId(@Param("siteId") Integer siteId);
+
+    List<Channel> getChannelList();
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/CommunityMapper.java

@@ -0,0 +1,43 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.CommunityDto;
+import com.zcxk.rmcp.pay.entity.Community;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface CommunityMapper {
+    int insert(@Param("community") Community community);
+
+    int insertSelective(@Param("community") Community community);
+
+    int insertList(@Param("communitys") List<Community> communitys);
+
+    int updateByPrimaryKeySelective(@Param("community") Community community);
+
+    List<CommunityDto> findBySiteId(@Param("siteId") Integer siteId);
+
+    List<CommunityDto> findByCustomerId(@Param("customerId") Integer customerId);
+
+    List<CommunityDto> queryList(@Param("param") Community param);
+
+    int findByNameUnique(@Param("siteId") Integer siteId, @Param("id") Integer id, @Param("province") Integer province, @Param("city") Integer city, @Param("region") Integer region, @Param("name") String name);
+
+    List<CommunityDto> getList(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("communityName") String communityName, @Param("province") Integer province, @Param("city") Integer city, @Param("region") Integer region);
+
+    Community findById(@Param("id") Integer id);
+
+    List<Community> getBySiteId(@Param("siteId") Integer siteId);
+
+    List<Community> getByCustomerId(@Param("customerId") Integer customerId);
+
+    List<Community> getMaxCodeBySiteId(@Param("siteId") Integer siteId);
+
+    List<CommunityDto> getListByCustomerIds(@Param("siteId") Integer siteId, @Param("customerIds") List<Integer> customerIds, @Param("communityName") String communityName, @Param("province") Integer province, @Param("city") Integer city, @Param("region") Integer region);
+
+    Community findByNameV2(@Param("siteId") Integer siteId, @Param("province") Integer province, @Param("city") Integer city, @Param("region") Integer region, @Param("communityName") String communityName);
+
+    Community findByName(@Param("siteId") Integer siteId, @Param("communityName") String communityName);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/CustomerMapper.java

@@ -0,0 +1,44 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.CustomerDto;
+import com.zcxk.rmcp.pay.entity.Customer;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+@Mapper
+public interface CustomerMapper {
+    int insert(@Param("customer") Customer customer);
+
+    int insertSelective(@Param("customer") Customer customer);
+
+    int insertList(@Param("customers") List<Customer> customers);
+
+    int updateByPrimaryKeySelective(@Param("customer") Customer customer);
+
+    List<Customer> getList(@Param("siteId") Integer siteId);
+
+    List<CustomerDto> getCustomerList(@Param("siteId") Integer siteId, @Param("customerName") String customerName);
+
+    int findByNameUnique(@Param("siteId") Integer siteId, @Param("id") Integer id, @Param("customerName") String customerName);
+
+    int findByNoUnique(@Param("customerNo") String customerNo);
+
+    Customer findById(@Param("customerId") Integer customerId);
+
+    List<Customer> findByIds(@Param("ids") List<Integer> ids);
+
+    List<Customer> getListById(@Param("customerId") Integer customerId);
+
+    List<CustomerDto> getCustomerTree(@Param("siteId") Integer siteId, @Param("customerName") String customerName);
+
+    Integer countChildrenNum(@Param("customerId") Integer customerId);
+
+    CustomerDto getCustomerByCustomerno(@Param("customerNo") String customerNo);
+
+    Customer findByName(@Param("siteId") Integer siteId, @Param("name") String name);
+
+    void updateCustomer(@Param("oldNo") String oldNo, @Param("newNo") String newNo);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/DeviceMapper.java

@@ -0,0 +1,30 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.MeterSyncDto;
+import com.zcxk.rmcp.pay.entity.Device;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceMapper {
+    //通过站点id删除设备
+    int deleteBySiteId(@Param("siteId") Integer siteId, @Param("updateBy") String updateBy);
+
+    //通过场景id删除设备
+    int deleteBySysId(@Param("sysId") Integer sysId, @Param("updateBy") String updateBy);
+
+    int insertList(@Param("devices") List<Device> devices);
+
+    //查询未同步的水表
+    List<Device> getNoSyncList(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    //同步水表信息
+    int updateSync(@Param("devices") MeterSyncDto devices);
+
+    int updateSyncDeviceStatus(@Param("devices") MeterSyncDto devices);
+
+    List<Device> findList(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+}
+

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/DimensionMapper.java

@@ -0,0 +1,21 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.Dimension;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DimensionMapper {
+    int insert(@Param("dimension") Dimension dimension);
+
+    int insertSelective(@Param("dimension") Dimension dimension);
+
+    int insertList(@Param("dimensions") List<Dimension> dimensions);
+
+    int updateByPrimaryKeySelective(@Param("dimension") Dimension dimension);
+
+    List<Dimension> getAllDimension();
+    
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/FileMapper.java

@@ -0,0 +1,20 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.File;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface FileMapper {
+    int insert(@Param("file") File file);
+
+    int insertSelective(@Param("file") File file);
+
+    int insertList(@Param("files") List<File> files);
+
+    int updateByPrimaryKeySelective(@Param("file") File file);
+
+    File getById(@Param("id") String id);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/ImportMapper.java

@@ -0,0 +1,18 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.Import;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ImportMapper {
+    int insertSelective(Import record);
+
+    int updateByPrimaryKeySelective(Import record);
+
+    int batchInsert(@Param("list") List<Import> list);
+
+    Import findByObjId(@Param("objId") Integer objId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/LoginLogsMapper.java

@@ -0,0 +1,20 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.LoginLogs;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface LoginLogsMapper {
+    int insert(@Param("loginLogs") LoginLogs loginLogs);
+
+    int insertSelective(@Param("loginLogs") LoginLogs loginLogs);
+
+    int insertList(@Param("loginLogss") List<LoginLogs> loginLogss);
+
+    int updateByPrimaryKeySelective(@Param("loginLogs") LoginLogs loginLogs);
+
+    List<LoginLogs> getList(@Param("siteId") Integer siteId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/MessageMapper.java

@@ -0,0 +1,24 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.Message;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface MessageMapper {
+    int insertSelective(Message record);
+
+    int updateByPrimaryKeySelective(Message record);
+
+    int batchInsert(@Param("list") List<Message> list);
+
+    List<Message> getList(@Param("userId") Integer userId, @Param("read") Integer read);
+
+    Integer getMessageCount(@Param("userId") Integer userId);
+
+    int delMessage(@Param("ids") List<Integer> ids);
+
+    int markRead(@Param("ids") List<Integer> ids);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/OperationLogMapper.java

@@ -0,0 +1,20 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.OperationLog;
+import com.zcxk.rmcp.pay.entity.ProgramItem;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Mapper
+public interface OperationLogMapper {
+    int insertSelective(OperationLog record);
+
+    int updateByPrimaryKeySelective(OperationLog record);
+
+    List<OperationLog> getList(@Param("siteId") Integer siteId, @Param("programItems") List<ProgramItem> programItems,
+                               @Param("username") String username, @Param("content") String content,
+                               @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("mobilephone") String mobilephone);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/OrganizationMapper.java

@@ -0,0 +1,33 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.OrganizationDto;
+import com.zcxk.rmcp.pay.entity.Organization;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface OrganizationMapper {
+    int insert(@Param("organization") Organization organization);
+
+    int insertSelective(@Param("organization") Organization organization);
+
+    int insertList(@Param("organizations") List<Organization> organizations);
+
+    int updateByPrimaryKeySelective(@Param("organization") Organization organization);
+
+    List<OrganizationDto> findList(@Param("siteId") Integer siteId);
+
+    List<OrganizationDto> findListForCustomer(@Param("customerId") Integer customerId);
+
+    int findByNameUnique(@Param("id") Integer id, @Param("siteId") Integer siteId, @Param("parentId") Integer parentId, @Param("name") String name);
+
+    Integer countParentId(@Param("id") Integer id);
+
+    List<OrganizationDto> fingByOrganizationOne(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    List<OrganizationDto> findListLikeOrgin(@Param("id") Integer id, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    String findOrginName(@Param("id") String id, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/PermissionMapper.java

@@ -0,0 +1,46 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.Permission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface PermissionMapper {
+    int insert(@Param("permission") Permission permission);
+
+    int insertSelective(@Param("permission") Permission permission);
+
+    int insertList(@Param("permissions") List<Permission> permissions);
+
+    int updateByPrimaryKeySelective(@Param("permission") Permission permission);
+
+    List<Permission> getAllMenu();
+
+    List<Permission> getMenuByUserId(@Param("userId") Integer userId, @Param("siteId") Integer siteId);
+
+    List<Permission> getMenuBySuperAdmin();
+
+    List<Permission> getElementByUserId(@Param("userId") Integer userId, @Param("siteId") Integer siteId);
+
+    List<Permission> getAllPermission(@Param("isSuperAdminMenu") Integer isSuperAdminMenu, @Param("isSiteMenu") Integer isSiteMenu, @Param("sysIdList") List<Integer> sysIdList);
+
+    List<Permission> getAllPermissionV2(@Param("isSuperAdminMenu") Integer isSuperAdminMenu, @Param("isSiteMenu") Integer isSiteMenu, @Param("isBillingMenu") Integer isBillingMenu);
+
+    List<Permission> getRolePermissionByRoleId(@Param("roleId") Integer roleId);
+
+    int delById(@Param("id") Integer id, @Param("updateBy") String updateBy);
+
+    List<Permission> getPermissionBySuperAdmin();
+
+    List<Permission> getPermissionBySiteAdmin(@Param("siteId") Integer siteId, @Param("isMenu") Integer isMenu, @Param("isSiteMenu") Integer isSiteMenu, @Param("isBillingMenu") Integer isBillingMenu);
+
+
+    int findByNameUnique(@Param("id") Integer id, @Param("parentId") Integer parentId, @Param("name") String name);
+
+    Permission findById(@Param("id") Integer id);
+
+    int delBySysId(@Param("sysId") Integer sysId, @Param("updateBy") String updateBy);
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/PersonTypeChannelMapper.java

@@ -0,0 +1,20 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.PersonTypeChannel;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface PersonTypeChannelMapper {
+    int insert(@Param("personTypeChannel") PersonTypeChannel personTypeChannel);
+
+    int insertSelective(@Param("personTypeChannel") PersonTypeChannel personTypeChannel);
+
+    int insertList(@Param("personTypeChannels") List<PersonTypeChannel> personTypeChannels);
+
+    int updateByPrimaryKeySelective(@Param("personTypeChannel") PersonTypeChannel personTypeChannel);
+
+    int isBindChannel(@Param("personTypeDefId") int personTypeDefId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/PersonTypeDefMapper.java

@@ -0,0 +1,25 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.PersonTypeDefDto;
+import com.zcxk.rmcp.pay.entity.PersonTypeDef;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface PersonTypeDefMapper {
+    int insert(@Param("personTypeDef") PersonTypeDef personTypeDef);
+
+    int insertSelective(@Param("personTypeDef") PersonTypeDef personTypeDef);
+
+    int insertList(@Param("personTypeDefs") List<PersonTypeDef> personTypeDefs);
+
+    int updateByPrimaryKeySelective(@Param("personTypeDef") PersonTypeDef personTypeDef);
+
+    List<PersonTypeDefDto> getList(@Param("name") String name);
+
+    List<PersonTypeDef> getAll();
+
+    int queryByName(@Param("name") String name, @Param("id") int id);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/PersonTypeDimensionMapper.java

@@ -0,0 +1,17 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.PersonTypeDimension;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface PersonTypeDimensionMapper {
+
+    int updateStatus(@Param("personTypeDefId") int personTypeDefId, @Param("dimensionIdList") int[] dimensionIdList, @Param("status") int status);
+
+    List<PersonTypeDimension> queryDimensionListById(@Param("personTypeDefId") int personTypeDefId);
+
+    int insertAllDimension(@Param("personTypeDefId") int personTypeDefId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/ProgramItemMapper.java

@@ -0,0 +1,25 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.ProgramItemDto;
+import com.zcxk.rmcp.pay.entity.ProgramItem;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ProgramItemMapper {
+    int insert(@Param("programItem") ProgramItem programItem);
+
+    int insertSelective(@Param("programItem") ProgramItem programItem);
+
+    int insertList(@Param("programItems") List<ProgramItem> programItems);
+
+    int updateByPrimaryKeySelective(@Param("programItem") ProgramItem programItem);
+
+    int delByProgramId(@Param("programId") Integer programId, @Param("updateBy") String updateBy);
+
+    List<ProgramItemDto> getDimensionValue(@Param("programId") int programId);
+
+    List<ProgramItem> getBySiteIdAndUserId(@Param("siteId") Integer siteId, @Param("userId") Integer userId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/ProgramMapper.java

@@ -0,0 +1,30 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.ProgramDto;
+import com.zcxk.rmcp.pay.entity.Program;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ProgramMapper {
+    int insert(@Param("program") Program program);
+
+    int insertSelective(@Param("program") Program program);
+
+    int insertList(@Param("programs") List<Program> programs);
+
+    int updateByPrimaryKeySelective(@Param("program") Program program);
+
+    int findByNameUnique(@Param("siteId") Integer siteId, @Param("id") Integer id, @Param("programName") String programName);
+
+    List<ProgramDto> queryList(@Param("siteId") Integer siteId, @Param("name") String name);
+
+    int delByProgramId(@Param("id") Integer id, @Param("updateBy") String updateBy);
+
+    List<ProgramDto> getList(@Param("siteId") Integer siteId);
+
+    List<Program> getByUserRole(@Param("userId") Integer userId, @Param("roleId") Integer roleId);
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/RoleMapper.java

@@ -0,0 +1,28 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.Role;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface RoleMapper {
+    int insert(@Param("role") Role role);
+
+    int insertSelective(@Param("role") Role role);
+
+    int insertList(@Param("roles") List<Role> roles);
+
+    int updateByPrimaryKeySelective(@Param("role") Role role);
+
+    int delRole(@Param("roleId") Integer roleId, @Param("updateBy") String updateBy);
+
+    Role findBySiteIdAndType(@Param("siteId") Integer siteId, @Param("type") Integer type);
+
+    List<Role> getBySiteIdAndType(@Param("siteId") Integer siteId, @Param("name") String name, @Param("type") Integer type);
+
+    Role findById(@Param("roleId") Integer roleId);
+
+    int findByNameUnique(@Param("id") Integer id, @Param("siteId") Integer siteId, @Param("name") String name);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/RolePermissionMapper.java

@@ -0,0 +1,16 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.RolePermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface RolePermissionMapper {
+    int insert(@Param("rolePermission") RolePermission rolePermission);
+
+    int insertList(@Param("rolePermissions") List<RolePermission> rolePermissions);
+
+    int delRolePermissionByRoleId(@Param("roleId") Integer roleId, @Param("updateBy") String updateBy);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/SiteChannelMapper.java

@@ -0,0 +1,17 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.SiteChannel;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SiteChannelMapper {
+
+    int insertList(@Param("siteChannels") List<SiteChannel> siteChannels);
+
+    int deleteBySiteId(@Param("siteId") Integer siteId, @Param("updateBy") String updateBy);
+
+    List<Integer> countByChannelId(@Param("channelId") Integer channelId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/SiteMapper.java

@@ -0,0 +1,32 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.SiteDto;
+import com.zcxk.rmcp.pay.dto.pay.SiteinfoDto;
+import com.zcxk.rmcp.pay.entity.Site;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SiteMapper {
+    int insert(@Param("site") Site site);
+
+    int insertSelective(@Param("site") Site site);
+
+    int insertList(@Param("sites") List<Site> sites);
+
+    int updateByPrimaryKeySelective(@Param("site") Site site);
+
+    List<SiteDto> getList(@Param("siteIds") List<Integer> siteIds, @Param("name") String name);
+
+    int delete(@Param("id") Integer id, @Param("updateBy") String updateBy);
+
+    int findByNameUnique(@Param("id") Integer id, @Param("name") String name);
+
+    Site findById(@Param("siteId") Integer siteId);
+
+    int findByCustomerIdUnique(@Param("id") Integer id, @Param("customerId") Integer customerId);
+
+    SiteinfoDto getSiteAndCustomerByCustomerNo(@Param("customerNo") String customerNo);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/SitePermissionMapper.java

@@ -0,0 +1,15 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.SitePermission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SitePermissionMapper {
+
+    int batchInsert(@Param("list") List<SitePermission> list);
+
+    int delBySiteId(@Param("siteId") Integer siteId, @Param("username") String username);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/SiteUserMapper.java

@@ -0,0 +1,35 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.SiteUserDto;
+import com.zcxk.rmcp.pay.dto.UserDto;
+import com.zcxk.rmcp.pay.entity.Site;
+import com.zcxk.rmcp.pay.entity.SiteUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SiteUserMapper {
+    int insert(@Param("siteUser") SiteUser siteUser);
+
+    int updateByPrimaryKeySelective(@Param("siteUser") SiteUser siteUser);
+
+    int deleteBySiteId(@Param("siteId") Integer siteId, @Param("updateBy") String updateBy, @Param("isAdmin") Integer isAdmin);
+
+    List<UserDto> unbindUser(@Param("siteId") Integer siteId);
+
+    List<UserDto> deleteQuery(@Param("userIds") List<Integer> userIds);
+
+    List<UserDto> getAllUserList(@Param("siteId") Integer siteId, @Param("organId") Integer organId);
+
+    List<Integer> findBySiteId(@Param("siteId") Integer siteId, @Param("isAdmin") Integer isAdmin);
+
+    List<Site> getSiteByUserId(@Param("userId") Integer userId);
+
+    List<SiteUserDto> getSiteByUserIdV2(@Param("userId") Integer userId);
+
+    SiteUser findBySiteIdAndUserId(@Param("siteId") Integer siteId, @Param("userId") Integer userId);
+
+    int deleteBySiteIdAndUserIds(@Param("siteId") Integer siteId, @Param("userIds") List<Integer> userIds);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/SysLogsDao.java

@@ -0,0 +1,18 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.SysLogs;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SysLogsDao {
+    int insert(@Param("sysLogs") SysLogs sysLogs);
+
+    int insertSelective(@Param("sysLogs") SysLogs sysLogs);
+
+    int insertList(@Param("sysLogss") List<SysLogs> sysLogss);
+
+    int update(@Param("sysLogs") SysLogs sysLogs);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/UserApplyMapper.java

@@ -0,0 +1,18 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.UserApply;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface UserApplyMapper {
+    int insertSelective(UserApply record);
+
+    int updateByPrimaryKeySelective(UserApply record);
+
+    List<UserApply> getList(@Param("username") String username);
+
+    UserApply findById(@Param("id") Integer id);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/UserMapper.java

@@ -0,0 +1,41 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.dto.UserRoleDto;
+import com.zcxk.rmcp.pay.entity.User;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.util.List;
+
+@Mapper
+public interface UserMapper {
+
+    int insertSelective(@Param("user") User user);
+
+    int update(@Param("user") User user);
+
+    User findUserById(@Param("id") Integer id);
+
+    List<UserRoleDto> findUserList(@Param("username") String username, @Param("name") String name, @Param("mobilePhone") String mobilePhone);
+
+    User findUserByMobile(@Param("mobile") String mobile);
+
+    List<UserRoleDto> findBySiteId(@Param("siteId") Integer siteId, @Param("username") String username, @Param("name") String name, @Param("mobilePhone") String mobilePhone, @Param("organId") Integer organId, @Param("roleId") Integer roleId, @Param("programId") Integer programId);
+
+    int deleteByUserId(@Param("userId") Integer userId, @Param("updateBy") String updateBy);
+
+    int deleteSiteUser(@Param("siteId") Integer siteId, @Param("userId") Integer userId);
+
+    int findUserByMobilePhoneUnique(@Param("id") Integer id, @Param("mobilePhone") String mobilePhone);
+
+    int findUserByMobilePhoneSiteUnique(@Param("id") Integer id, @Param("siteId") Integer siteId, @Param("mobilePhone") String mobilePhone);
+
+    User findUserByOpenid(@Param("openid") String openid);
+
+    Integer countOrganId(@Param("organId") Integer organId);
+
+    User findUserByName(@Param("name") String name, @Param("sitId") BigInteger sitId);
+
+}
+

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/UserRoleMapper.java

@@ -0,0 +1,24 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.UserRole;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface UserRoleMapper {
+    int insert(@Param("userRole") UserRole userRole);
+
+    int insertSelective(@Param("userRole") UserRole userRole);
+
+    int deleteByUserId(@Param("userId") Integer userId, @Param("updateBy") String updateBy);
+
+    int deleteSiteUser(@Param("siteId") Integer siteId, @Param("userId") Integer userId);
+
+    int deleteBySiteIdAndUserId(@Param("siteId") Integer siteId, @Param("userId") Integer userId, @Param("updateBy") String updateBy);
+
+    int findByRoleId(@Param("roleId") Integer roleId);
+
+    int deleteBySiteIdAndUserIds(@Param("siteId") Integer siteId, @Param("userIds") List<Integer> userIds);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/UserRoleProgramMapper.java

@@ -0,0 +1,30 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.UserRoleProgram;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface UserRoleProgramMapper {
+    int insert(@Param("userRoleProgram") UserRoleProgram userRoleProgram);
+
+    int insertSelective(@Param("userRoleProgram") UserRoleProgram userRoleProgram);
+
+    int insertList(@Param("userRolePrograms") List<UserRoleProgram> userRolePrograms);
+
+    int updateByPrimaryKeySelective(@Param("userRoleProgram") UserRoleProgram userRoleProgram);
+
+    int delByUserId(@Param("userId") Integer userId, @Param("updateBy") String updateBy);
+
+    int delSiteUser(@Param("siteId") Integer siteId, @Param("userId") Integer userId);
+
+    int delBySiteIdAndUserId(@Param("siteId") Integer siteId, @Param("userId") Integer userId, @Param("updateBy") String updateBy);
+
+    int countByProgramId(@Param("programId") Integer programId);
+
+    int batchDelByUserId(@Param("userIds") List<Integer> userIds, @Param("updateBy") String updateBy);
+
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/WaterMeterReplaceLogMapper.java

@@ -0,0 +1,15 @@
+package com.zcxk.rmcp.pay.dao;
+
+import com.zcxk.rmcp.pay.entity.WaterMeterReplaceLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * Created by ZJY on 2020-09-27 16:33
+ */
+
+@Mapper
+public interface WaterMeterReplaceLogMapper {
+
+    int insertSelective(WaterMeterReplaceLog record);
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/AmountWaterUsedAmountMapper.java

@@ -0,0 +1,100 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.*;
+import com.zcxk.rmcp.pay.dto.pay.AmountSynParamDto;
+import com.zcxk.rmcp.pay.entity.ProgramItem;
+import com.zcxk.rmcp.pay.entity.pay.AmountWaterUsedAmount;
+import com.zcxk.rmcp.pay.entity.pay.AmountWaterUsedAmountByDay;
+import com.zcxk.rmcp.pay.entity.pay.DeviceReplaceRecord;
+import com.zcxk.rmcp.pay.entity.pay.archives.PayBaseCustomerandmeterrela;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.List;
+
+@Mapper
+public interface AmountWaterUsedAmountMapper {
+
+    int update(@Param("amountWaterUsedAmount") AmountWaterUsedAmount amountWaterUsedAmount);
+
+    AmountWaterUsedAmount get(@Param("id") BigInteger id, @Param("customerId") Integer customerId, @Param("siteId") Integer siteId);
+
+    List<AmountWaterUsedAmountDto> getList(@Param("condition") String condition, @Param("customerId") Integer customerId, @Param("accountnumber") String accountNumber,
+                                           @Param("accountname") String accountName, @Param("metercode") String meterCode, @Param("address") String address,
+                                           @Param("state") Integer state, @Param("amountMin") Integer amountMin, @Param("amountMax") Integer amountMax,
+                                           @Param("year") Integer year, @Param("month") Integer month, @Param("programItems") List<ProgramItem> programItems,
+                                           @Param("siteId") Integer siteId);
+
+    List<AmountWaterUsedAmountDto> getWaterUsedAmountByMeterId(@Param("waterMeterId") BigInteger waterMeterId);
+
+
+    List<BigInteger> getIds(@Param("condition") String condition, @Param("customerId") Integer customerId, @Param("accountnumber") String accountNumber,
+                            @Param("accountname") String accountName, @Param("metercode") String meterCode, @Param("address") String address,
+                            @Param("state") Integer state, @Param("amountMin") Integer amountMin, @Param("amountMax") Integer amountMax,
+                            @Param("year") Integer year, @Param("month") Integer month, @Param("programItems") List<ProgramItem> programItems,
+                            @Param("siteId") Integer siteId);
+
+    List<Integer> getCustId();
+
+    Integer getAllAmountCount(@Param("year") Integer year, @Param("month") Integer month, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    Integer createdAmount(@Param("year") Integer year, @Param("month") Integer month, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    List<AmountWaterUsedAmountDto> getAllAmountRecord(@Param("year") Integer year, @Param("month") Integer month, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    Integer batchUpdate(@Param("amountWaterUsedAmount") AmountWaterUsedAmountDto amountWaterUsedAmount);
+
+    Integer getAllAmountCountByDay(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    Integer createdAmountByDay(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    @MapKey("watermeterId")
+    HashMap<BigInteger, AmountWaterUsedAmountByDay> getAmountWaterUsedAmountByDay(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    Integer updateByDate(@Param("amountWaterUsedAmount") AmountWaterUsedAmountByDay amountWaterUsedAmount);
+
+    List<AmountWaterUsedAmountByDay> getAllAmountRecordByDay(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    List<BigInteger> getWaterMeterIdByDay(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    List<PayBaseCustomerandmeterrela> getCustIdAndSiteId();
+
+    List<PayBaseCustomerandmeterrela> getCustIdAndSiteIdByAccount();
+
+    AmountWaterUsedAmount getLastReadrecord(@Param("metercode") String metercode, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    //插入换表信息
+    Integer insertReplaceRecord(@Param("deviceReplaceRecord") DeviceReplaceRecord deviceReplaceRecord);
+
+    //根据水表编码查询水表信息
+    BaseWatermeterDto getWatermeterInfoByMetercode(@Param("metercode") String metercode, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    Integer updateWatermeterInfo(@Param("baseWatermeterDto") BaseWatermeterDto baseWatermeterDto);
+
+    //插入水量同步基础信息（同步计划）
+    Integer insertSelectAmountBaseInfo(@Param("year") Integer year, @Param("month") Integer month, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    //获取需要同步水量的水表编码
+    List<String> getSynAmountMetercode(@Param("year") Integer year, @Param("month") Integer month, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    AmountSynParamDto GetAmountSynMeterInfo(@Param("year") Integer year, @Param("month") Integer month, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    //获取同步计划
+    List<String> GetAmountSynInfo(@Param("year") Integer year, @Param("month") Integer month, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+
+    @MapKey("metercode")
+    HashMap<String, DeviceReplaceRecord > getRepalceRecordCount(@Param("year") Integer year, @Param("month") Integer month, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    Integer getwaterUserdAmount(@Param("year") Integer year, @Param("month") Integer month, @Param("siteId") Integer siteId,
+                                @Param("customerId") Integer customerId, @Param("id") BigInteger id);
+
+    List<EstimatedDayDto> getEstimatedDay(@Param("readdate") String readdate, @Param("year") Integer year, @Param("month") Integer month,
+                                          @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    //创建水量信息(全部)
+    Integer createdAllAmountByDay(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/BaseClosingAccountInfoMapper.java

@@ -0,0 +1,40 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.BaseClosingAccountInfoDto;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @create 2020-04-24 8:31
+ */
+@Mapper
+public interface BaseClosingAccountInfoMapper {
+
+    public BaseClosingAccountInfoDto get(@Param("id") BigInteger id);
+
+    public List<BaseClosingAccountInfoDto> getList(@Param("year") Integer year, @Param("month") Integer month,
+                                                   @Param("tenantId") String tenantId,
+                                                   @Param("state") Integer state);
+
+    public List<BaseClosingAccountInfoDto> getListNumber(@Param("year") Integer year, @Param("month") Integer month,
+                                                         @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId,
+                                                         @Param("state") Integer state);
+
+    public int insert(@Param("baseClosingAccountInfoDto") BaseClosingAccountInfoDto baseClosingAccountInfoDto);
+
+    public int update(@Param("baseClosingAccountInfoDto") BaseClosingAccountInfoDto baseClosingAccountInfoDto);
+
+
+    public int checkClosing(@Param("year") Integer year, @Param("month") Integer month, @Param("type") String i,
+                            @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    public BaseClosingAccountInfoDto getLastClosingAccount(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    BaseClosingAccountInfoDto getCurrentCloseInfo(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    List<BaseClosingAccountInfoDto> getClosingSC();
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/BasePriceOfWaterPropertyMapper.java

@@ -0,0 +1,16 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.entity.pay.BasePriceOfWaterProperty;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+
+@Mapper
+public interface BasePriceOfWaterPropertyMapper {
+    public int delete(@Param("waterPropertyId") BigInteger waterPropertyId);
+
+    public int insert(@Param("basePriceOfWaterProperty") BasePriceOfWaterProperty basePriceOfWaterProperty);
+}
+
+

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/BaseWaterPropertyMapper.java

@@ -0,0 +1,37 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.BaseWaterPropertyDataDto;
+import com.zcxk.rmcp.pay.dto.pay.BaseWaterPropertyDto;
+import com.zcxk.rmcp.pay.entity.pay.PayBaseWaterprice;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.util.List;
+
+@Mapper
+public interface BaseWaterPropertyMapper {
+
+    public BaseWaterPropertyDto get(@Param("id") BigInteger id, @Param("tenantId") String tenantId);
+
+    public List<PayBaseWaterprice> getFeeInfo(@Param("id") BigInteger id, @Param("level") Integer level, @Param("customerId") Integer customerId,
+                                              @Param("siteId") Integer siteId);
+
+    public List<BaseWaterPropertyDto> getList(@Param("name") String name, @Param("customerId") BigInteger customerId,
+                                              @Param("siteId") BigInteger siteId);
+
+    public int delete(@Param("id") BigInteger id);
+
+    public int getCustomerCountByPropertyId(@Param("id") BigInteger id);
+
+
+    public int insert(@Param("baseWaterPropertyDto") BaseWaterPropertyDto baseWaterPropertyDto);
+
+    public int update(@Param("baseWaterPropertyDto") BaseWaterPropertyDto baseWaterPropertyDto);
+
+    public List<BaseWaterPropertyDataDto> getAll(@Param("tenantId") String tenantId);
+    public List<PayBaseWaterprice>queryBaseWaterPrice(@Param("tenantId") String tenantId,
+                                                      @Param("waterpropertyId") BigInteger waterpropertyId, @Param("ladderlevel") Integer ladderlevel);
+    public Integer checkName(@Param("name") String name, @Param("customerId") Integer customerId,
+                             @Param("siteId") Integer siteId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayAgenttransactionMapper.java

@@ -0,0 +1,22 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.PayAgenttransactionDto;
+import com.zcxk.rmcp.pay.entity.pay.PayAgenttransaction;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author wangli
+ * 2020-05-15 16:21
+ * @Description
+ * @Version 1.0
+ */
+@Mapper
+public interface PayAgenttransactionMapper {
+    List<PayAgenttransactionDto> findList(PayAgenttransactionDto payAgenttransactionDto);
+    void cancelByPayseriesno(@Param("payseriesno") String payseriesno, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+    void cancelCheckAgentPayseriesno(@Param("payseriesno") String payseriesno, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+    Integer insertAgenttransaction(PayAgenttransaction payAgenttransaction);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayBaseAccountMapper.java

@@ -0,0 +1,69 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.dto.pay.*;
+import com.zcxk.rmcp.pay.entity.pay.PayBaseAccount;
+import com.zcxk.rmcp.pay.entity.pay.PayMeter;
+import com.zcxk.rmcp.pay.entity.pay.archives.AccountInfo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+
+@Mapper
+public interface PayBaseAccountMapper {
+
+    PayBaseAccount get(@Param("id") BigInteger id);
+
+    int insert(@Param("payBaseAccount") PayBaseAccount payBaseAccount);
+
+    @Select("select MAX(accountnumber) maxNumber from pay_base_account where SUBSTRING(accountnumber,1,3)=#{CommunityId}")
+    Object getMaxAccount(String CommunityId);
+
+    @Delete("delete from  pay_base_account  where id=#{Id}")
+    int delete(Integer Id);
+
+    List<PayBaseAccount>getAll(@Param("queryInfo") String queryInfo, @Param("tenantId") String tenantId);
+
+    int update(@Param("payBaseAccount") PayBaseAccount payBaseAccount);
+
+    int batchInsert(@Param("list") List<PayBaseAccountDto> list);
+
+    int batchDel(@Param("accountIds") List<BigInteger> accountIds);
+
+    List<PayBaseAccountSelectDto>findList(@Param("queryInfo") String queryInfo, @Param("state") String state, @Param("sortColumn") String sortColumn, @Param("sortOrder") String sortOrder, @Param("year") Integer year, @Param("month") Integer month, @Param("programItemList") UserCondition programItemList,@Param("tenantId") String tenantId);
+    List<PayBaseAccountSelectAccountnumberDto>findAccountnumberList(@Param("queryInfo") String queryInfo, @Param("payment") BigDecimal payment, @Param("tenantId") String tenantId);
+
+    //根据客户编号查询缴费总额
+    BigDecimal getAccountPayment(@Param("accountnumber") String accountnumber, @Param("tenantId") String tenantId);
+
+    List<PayBaseAccountWaterusedamountDto>findMeterWaterInfo(@Param("metercode") String metercode, @Param("year") String year, @Param("tenantId") String tenantId);
+
+    List<PayBaseAccountTransactionsDto>findTransactionDetail(@Param("accountnumber") String accountnumber, @Param("year") String year, @Param("tenantId") String tenantId);
+
+    List<PayBaseAccountMeterDto> findWaterMeter(@Param("accountnumber") String accountnumber, @Param("tenantId") String tenantId);
+
+    //查询水表信息  涉及到查询云平台数据的如sc_device/抄表数据的，只按customer_id过滤
+    List<PayMeter>findMeterInfo(@Param("queryInfo") String queryInfo, @Param("address") String address, @Param("state") String state, @Param("sortColumn") String sortColumn, @Param("sortOrder") String sortOrder, @Param("tenantId") String tenantId, @Param("year") Integer year, @Param("month") Integer month, @Param("programItemList") UserCondition programItemList);
+
+    void updateAccountName(@Param("type") Integer type, @Param("accountname") String accountname, @Param("accountId") BigInteger accountId);
+
+    //获取未同步的水表信息
+    List<SynAccountInfo> getSynAccountInfo(@Param("createDate") String createDate);
+
+    //查询小区是否已使用
+    int findCommunityCount(@Param("communityId") Integer communityId);
+
+
+    int updateAccountAddr(@Param("accountId") BigInteger accountId,  @Param("address") String address);
+
+    int updateDeviceAddr(@Param("accountId") BigInteger accountId,  @Param("address") String address);
+
+    List<PayBaseAccount> getCustIdAndSiteId();
+
+    List<AccountInfo> getAccountInfoByMetercode(@Param("metercodes") List<String> metercodes);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayBaseConfigMapper.java

@@ -0,0 +1,32 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.PayBaseConfigDto;
+import com.zcxk.rmcp.pay.entity.pay.PayBaseConfig;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.util.List;
+
+@Mapper
+public interface PayBaseConfigMapper {
+
+    List<PayBaseConfigDto> getAllList(@Param("name") String name, @Param("cnname") String cnname, @Param("tenantId") String tenantId);
+
+    List<PayBaseConfigDto> getNameCnname(@Param("queryInfo") String queryInfo, @Param("sitId") Integer sitId, @Param("customerId") Integer customerId);
+
+    @Insert("insert into pay_base_config(value,name,cnname,type,create_by,create_date,update_by,update_date,remarks,del_flag,site_id,customer_id) values(#{value},#{name},#{cnname},#{type},#{create_by},#{create_date},#{update_by},#{update_date},#{remarks},#{del_flag},#{site_id},#{customer_id}) ")
+    int insertList(PayBaseConfig payBaseConfig);
+
+    @Delete("delete from  pay_base_config where id=#{id}")
+    int delete(BigInteger id);
+
+    //@Update("update pay_base_config set value = #{value},name=#{name},cnname=#{cnname},type=#{type},update_by=#{update_by},update_date=#{update_date},remarks=#{remarks} where id=#{id}")
+    int update(@Param("payBaseConfig") PayBaseConfig payBaseConfig);
+
+    //判断数据是否存在
+    List<Long> ExitsData(@Param("id") String id, @Param("name") String name, @Param("cnname") String cnname, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayBaseWatercategoryMapper.java

@@ -0,0 +1,32 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.PayBaseWatercategoryDto;
+import com.zcxk.rmcp.pay.entity.pay.PayBaseWatercategory;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * Created by Zjy on 2020/4/22 20:35
+ */
+@Mapper
+public interface PayBaseWatercategoryMapper {
+
+
+    int insert(@Param("payBaseWatercategory") PayBaseWatercategory payBaseWatercategory);
+
+    int update(@Param("payBaseWatercategory") PayBaseWatercategory payBaseWatercategory);
+
+    //判断是否使
+    int isUsed(@Param("id") BigInteger id, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    int delete(@Param("id") BigInteger id, @Param("updateBy") BigInteger updateBy, @Param("updateDate") LocalDateTime updateDate);
+
+    //判断数据是否存在
+    List<Long> ExitsData(@Param("id") String id, @Param("name") String name, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    List<PayBaseWatercategoryDto> getAll(@Param("name") String name, @Param("tenantId") String tenantId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayBaseWaterpriceMapper.java

@@ -0,0 +1,32 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.dto.pay.PayBaseWaterpriceSelectDto;
+import com.zcxk.rmcp.pay.entity.pay.PayBaseWaterprice;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * Created by Zjy on 2020/4/22 19:26
+ */
+@Mapper
+public interface PayBaseWaterpriceMapper {
+
+    List<PayBaseWaterpriceSelectDto> getAll(@Param("feename") String feename, @Param("tenantId") String tenantId, @Param("ladderlevel") Integer ladderLevel, UserCondition userCondition);
+
+    int insert(@Param("payBaseWaterprice") PayBaseWaterprice payBaseWaterprice);
+
+    int update(@Param("payBaseWaterprice") PayBaseWaterprice payBaseWaterprice);
+
+    int delete(@Param("id") BigInteger id, @Param("updateBy") BigInteger updateBy, @Param("updateDate") LocalDateTime updateDate);
+
+    //是否存在 用水价格名称(name)、费用类型(type),同一类型下不能有相同的名称
+    List<PayBaseWaterprice> ExitsData(@Param("id") String id, @Param("name") String name, @Param("type") String type, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    //是否使用
+    int isUsed(@Param("id") BigInteger id, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayChargeSurveyMapper.java

@@ -0,0 +1,88 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.PayAmountSurveyListDto;
+import com.zcxk.rmcp.pay.dto.pay.PayChangePeriodDto;
+import com.zcxk.rmcp.pay.entity.pay.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+
+@Mapper
+public interface PayChargeSurveyMapper {
+
+    public Integer getAccountCount(@Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public PayAccountSurvey getlastNumber(@Param("year") Integer year, @Param("month") Integer month,
+                                          @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public Integer getAccountNumber(@Param("startDate") String startDate, @Param("endDate") String endDate,
+                                    @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public Integer getMeterNumber(@Param("startDate") String startDate, @Param("endDate") String endDate,
+                                  @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public Integer getCustomerNumber(@Param("startDate") String startDate, @Param("endDate") String endDate,
+                                     @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public void insertAccountNumber(PayAccountSurvey payAccountSurvey);
+
+    public List<PayChangePeriodDto> getAccountList(@Param("endDate") String endDate, @Param("startDate") String startDate,
+                                                   @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public PayAccountSurvey getlastAccount(@Param("periodDate") String startDate,
+                                           @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public BigDecimal getCurrentTran(@Param("year") Integer year, @Param("month") Integer month,
+                                     @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public BigDecimal getReceivedCurrent(@Param("year") Integer year, @Param("month") Integer month,
+                                         @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public List<PayTransactionSurvey> getPayAmountList(@Param("year") Integer year, @Param("month") Integer month,
+                                                       @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public void insertTransaction(PayTransactionSurvey payTransactionSurvey);
+
+    public List<PayTransactionSurvey> getCurrentTranRocord(@Param("year") Integer year, @Param("month") Integer month,
+                                                           @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public List<PayTransactionSurvey> getCurrentReceived(@Param("year") Integer year, @Param("month") Integer month,
+                                                         @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public PayTransactionSurvey getLastTranRocord(@Param("year") Integer year, @Param("month") Integer month,
+                                                  @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public PayChargeSurvey getSumReceivable(@Param("year") Integer year, @Param("month") Integer month,
+                                            @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public BigDecimal getSumReceived(@Param("year") Integer year, @Param("month") Integer month,
+                                     @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public BigDecimal getSumPrestore(@Param("year") Integer year, @Param("month") Integer month,
+                                     @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public void insertFeeSummary(PayChargeSurvey payChargeSurvey);
+
+    public List<PayFeeSuevey> getFeeGroup(@Param("year") Integer year, @Param("month") Integer month,
+                                          @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public BigDecimal getAmountMonth(@Param("year") Integer year, @Param("month") Integer month,
+                                     @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public BigDecimal getAmountMonthSurvey(@Param("year") Integer year, @Param("month") Integer month,
+                                           @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public void insertAmount(PayAmountSurvey payAmountSurvey);
+
+    public BigDecimal getAmountInfo(@Param("startDate") String startDate, @Param("endDate") String endDate,
+                                    @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public BigDecimal getAmountSureyInfo(@Param("startDate") String startDate, @Param("endDate") String endDate,
+                                         @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    public List<PayAmountSurveyListDto> getAmountGroupList(@Param("year") Integer year, @Param("month") Integer month,
+                                                           @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayCheckbalanceMapper.java

@@ -0,0 +1,25 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.PayCheckbalanceDto;
+import com.zcxk.rmcp.pay.dto.pay.payfee.BankCheckBillParm;
+import com.zcxk.rmcp.pay.entity.pay.PayCheckbalance;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * @Author wangli
+ * 2020-05-15 16:21
+ * @Description
+ * @Version 1.0
+ */
+@Mapper
+public interface PayCheckbalanceMapper {
+    List<PayCheckbalanceDto> findList(PayCheckbalanceDto payCheckbalanceDto);
+    Integer batchInsert(@Param("payCheckbalances") List<PayCheckbalance> payCheckbalances);
+    Integer insertCheckBalanceLog(BankCheckBillParm bankCheckBillParm);
+    Integer updateAgenttransactionState(BigInteger id);
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayControlRecordMapper.java

@@ -0,0 +1,36 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.PayControlRecordDto;
+import com.zcxk.rmcp.pay.entity.pay.PayControlRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * Created by ZJY on 2021-01-14 16:01
+ */
+@Mapper
+public interface PayControlRecordMapper {
+
+    //添加
+    Integer add(@Param("payControlRecord") PayControlRecord payControlRecord);
+
+    //查询
+    List<PayControlRecordDto> findList(@Param("payControlRecordDto") PayControlRecordDto payControlRecordDto, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    List<PayControlRecordDto> findListByMeterCode(@Param("payControlRecordDto") PayControlRecordDto payControlRecordDto, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    List<PayControlRecordDto> findByYear(@Param("accountNumber") String accountNumber, @Param("year") Integer year, @Param("tenantId") String tenantId);
+
+    PayControlRecord findControlRecordByMetercode(@Param("meterCode") String meterCode);
+
+    Integer updateDeviceValveState(@Param("valveStatus") String valveStatus, @Param("meterCode") String meterCode);
+
+    Integer updateControlRecordResult(@Param("result") Integer result, @Param("valveStatus") Integer valveStatus, @Param("id") BigInteger id);
+    //最后一次记录
+    PayControlRecord getRecentRecord(@Param("payControlRecord") PayControlRecord payControlRecord);
+
+    void updateControlRecordResultTimeOut();
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayControlRuleMapper.java

@@ -0,0 +1,45 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.entity.Device;
+import com.zcxk.rmcp.pay.entity.pay.PayControlRule;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * Created by ZJY on 2021-01-11 11:42
+ */
+@Mapper
+public interface PayControlRuleMapper {
+
+    Integer add(@Param("payControlRule") PayControlRule payControlRule);
+
+    List<PayControlRule>findList(@Param("id") Integer id, @Param("name") String name, @Param("tenantId") String tenantId);
+
+    Integer edit(@Param("payControlRule") PayControlRule payControlRule);
+
+    Integer delete(@Param("id") String id);
+
+    //规则已使用
+    String isUsed(@Param("id") Integer id, @Param("customerId") BigInteger customerId);
+
+    //数据是否存在
+    List<PayControlRule>ExitsData(@Param("id") String id, @Param("name") String name, @Param("customerId") BigInteger customerId);
+
+    //用户欠费金额
+    BigDecimal findDebtMoney(@Param("accountId") String accountId);
+
+    //用户欠户天数
+    Integer findDebtDay(@Param("accountId") String accountId);
+
+    //用水金额
+    BigDecimal findUseMoeny(@Param("accountId") String accountId);
+
+    //开户状态
+    Integer findOpenUse(@Param("accountId") String accountId);
+
+    Device findDevice(@Param("watermeterId") BigInteger watermeterId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayFeeMapper.java

@@ -0,0 +1,90 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.dto.pay.*;
+import com.zcxk.rmcp.pay.dto.pay.payfee.*;
+import com.zcxk.rmcp.pay.entity.ProgramItem;
+import com.zcxk.rmcp.pay.entity.pay.BaseClosingAccountInfo;
+import com.zcxk.rmcp.pay.entity.pay.PayControlRule;
+import com.zcxk.rmcp.pay.entity.pay.PayPayAgentbranch;
+import com.zcxk.rmcp.pay.entity.pay.PayReceivable;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @Author wangli
+ * 2020-04-24 8:37
+ * @Description
+ * @Version 1.0
+ */
+@Mapper
+public interface PayFeeMapper {
+    PayCustomRechargeDto getCustomInfoByMeterOrAccount(@Param("accountId") String accountId, @Param("accountnumber") String accountnumber, @Param("metercode") String metercode, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    void updatePayReceivable(PayReceivable payReceivable);
+
+    void updateRechargeaccount(@Param("balance") BigDecimal balance, @Param("remaining") BigDecimal remaining, @Param("updateBy") BigInteger updateBy, @Param("updateDate") LocalDateTime updateDate, @Param("id") BigInteger id);
+
+    List<PayReceivable> getReceivable(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("accountId") BigInteger accountId, @Param("list") List<BigInteger> list);
+
+    BaseClosingAccountInfo getLastClosingAccount(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    void updateAccountState(@Param("accountId") BigInteger accountId);
+
+    List<PayfeeAccountInfoDto> findPayfeeAccountInfo(@Param("id") BigInteger id, @Param("condition") String condition, @Param("tenantId") String tenantId, @Param("userCondition") UserCondition userCondition);
+
+    PayfeeDetaileBill getPayfeeDetaileBill(@Param("accountId") BigInteger accountId);
+
+    PayfeeDetailed getPayfeeDetailed(@Param("accountId") BigInteger accountId);
+
+    List<PayfeeReceivableInfo> getPayreceivableDebt(@Param("accountId") BigInteger accountId, @Param("year") Integer year);
+
+    List<PayfeeReceivableInfo> getPayreceivableDebtDetailed(@Param("accountId") BigInteger accountId, @Param("year") Integer year, @Param("month") Integer month);
+
+    List<PayfeeReceivedInfo> getPayreceived(@Param("accountId") BigInteger accountId, @Param("year") Integer year, @Param("tenantId") String tenantId);
+
+    List<PayfeeReceivedInfo> getPayreceivedDetailed(@Param("accountId") BigInteger accountId, @Param("payseriesno") String payseriesno, @Param("year") Integer year, @Param("month") Integer month, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    List<PayfeeWaterusedamount> getWaterusedamount(@Param("accountId") BigInteger accountId, @Param("year") Integer year, @Param("tenantId") String tenantId);
+
+    List<PayInvoiceDto> getPayinvoiceInfo(@Param("accountId") BigInteger accountId, @Param("year") Integer year, @Param("tenantId") String tenantId);
+
+    BigInteger getWaterPropertyId(@Param("id") BigInteger id);
+
+    List<BankPayfeeAccountInfo> selectBankPayfeeAccountInfo(@Param("queryType") String queryType, @Param("queryValue") String queryValue);
+
+    PayPayAgentbranch selectPayAgentbranchInfo(@Param("code") String code, @Param("customerId") Integer customerId);
+
+
+    PayAgenttransactionDto selectAgenttransaction(@Param("orderNo") String orderNo);
+
+    List<PayValveStateInfoDto> getDeviceValveState(@Param("accountId") BigInteger accountId);
+
+    List<PayValveStateInfoDto> getDeviceValveStateByAccountId(@Param("accountId") BigInteger accountId);
+
+    List<PayValveStateInfoDto> getDeviceValveStateByAmount(@Param("list") List<BigInteger> list);
+
+    List<PayValveStateInfoDto> getDeviceValveStateByRecord();
+
+    Integer deleteControlValveInfoByDevice(@Param("list") List<BigInteger> list);
+
+
+    List<PayValveStateInfoDto> findValveInfoByMessages(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId,
+                                                       @Param("payControlRules") List<PayControlRule> payControlRules);
+    List<PayDebtPushMessageDto> findPayDebtPushMessages(@Param("condition") String condition,
+                                                        @Param("searchType") Integer searchType,
+                                                        @Param("beginDebtFee") BigDecimal beginDebtFee,
+                                                        @Param("endDebtFee") BigDecimal endDebtFee,
+                                                        @Param("tenantId") String tenantId,
+                                                        @Param("payControlRules") List<PayControlRule> payControlRules,
+                                                        @Param("accountIds")List<BigInteger> accountIds,
+                                                        @Param("userCondition") UserCondition userCondition);
+
+    List<PayControlRule> getValveRulesByType(@Param("action") int action, @Param("types") List<Integer> types, @Param("tenantId") String tenantId);
+}
+

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayInvoiceMapper.java

@@ -0,0 +1,62 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.PayInvoiceDto;
+import com.zcxk.rmcp.pay.dto.pay.PayTransactiondetails;
+import com.zcxk.rmcp.pay.dto.pay.payfee.PrintInvoiceData;
+import com.zcxk.rmcp.pay.dto.pay.payfee.PrintReceivedInfo;
+import com.zcxk.rmcp.pay.entity.pay.PayInvoice;
+import com.zcxk.rmcp.pay.entity.pay.PayPayReceived;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @description 收据打印
+ * @auto wangli
+ * @data 2020-07-30 8:39
+ */
+@Mapper
+public interface PayInvoiceMapper {
+    void insert(PayInvoice payInvoice);
+    List<PayInvoiceDto> findList(PayInvoiceDto payInvoiceDto);
+    PayInvoiceDto get(BigInteger id);
+
+    List<PayTransactiondetails> findTransByPayseriesno(@Param("payseriesno") String payseriesno, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+    List<PayPayReceived> findReceivedByPayseriesno(@Param("payseriesno") String payseriesno, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+    void updatePrintInvoiceRecord(@Param("type") Integer type, @Param("payseriesno") String payseriesno, @Param("invoiceId") BigInteger invoiceId, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    PrintInvoiceData getPrintDataOfTran(@Param("payseriesno") String payseriesno, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    PrintInvoiceData getLastWaterUsedRecord(@Param("accountId") BigInteger accountId, @Param("date") LocalDateTime date, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    PrintInvoiceData getPrintDataKailu(@Param("accountId") BigInteger accountId);
+
+    PrintInvoiceData getDateRangeInfoPrint(@Param("payseriesno") String payseriesno);
+
+    PrintInvoiceData getAccountInfoPrint(@Param("accountId") BigInteger accountId);
+    List<PrintReceivedInfo>  getPayfeeInfoPrint(@Param("minPeriod") Integer minPeriod, @Param("maxPeriod") Integer maxPeriod, @Param("accountId") BigInteger accountId);
+    PrintInvoiceData getPayfeeRemainingPrint(@Param("accountId") BigInteger accountId, @Param("maxPeriod") Integer maxPeriod, @Param("payseriesno") String payseriesno);
+
+    String findPayseriesnoByPrint(@Param("id") BigInteger id, @Param("type") Integer type);
+
+    void deleteTransPrint(@Param("id") BigInteger id);
+
+    void deleteReceivedPrint(@Param("id") BigInteger id);
+
+    void cancelPayInvoice(@Param("id") BigInteger id, @Param("canceltime") LocalDateTime canceltime, @Param("cancelperson") BigInteger cancelperson);
+
+    PrintInvoiceData countTransactiondetails(@Param("payseriesno") String payseriesno);
+
+    PrintInvoiceData getAmountPeriod(@Param("payseriesno") String payseriesno);
+
+    PrintInvoiceData getAmountInfoAndReceivablefee(@Param("accountId") BigInteger accountId, @Param("maxPeriod") Integer maxPeriod, @Param("minPeriod") Integer minPeriod);
+
+    PrintInvoiceData getAccountBaseInfo(@Param("accountId") BigInteger accountId);
+
+    PrintInvoiceData getPayInvoiceType(@Param("payseriesno") String payseriesno);
+
+    PrintInvoiceData getPayInvoiceReceivable(@Param("payseriesno") String payseriesno);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayInvoiceParamMapper.java

@@ -0,0 +1,26 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.entity.pay.PayInvoiceParam;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * @ClassName PayInvoiceParamMapper
+ * @Description: TODO
+ * @Author :WYY
+ * @Date 2020/7/27
+ * @Version V1.0
+ **/
+@Mapper
+public interface PayInvoiceParamMapper {
+    int insert(PayInvoiceParam payInvoiceParam);
+
+    int batchInsert(@Param("list") List<PayInvoiceParam> list);
+
+    int update(@Param("payInvoiceParam") PayInvoiceParam payInvoiceParam);
+
+    List<PayInvoiceParam> findList(@Param("queryparam") String queryparam, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayInvoicePrintMapper.java

@@ -0,0 +1,33 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.dto.pay.payfee.PayInvoiceSearchDto;
+import com.zcxk.rmcp.pay.dto.pay.payfee.PayfeeInvoicePrintDto;
+import com.zcxk.rmcp.pay.entity.pay.PayInvoiceprinted;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * @ClassName PayInvoicePrintMapper
+ * @Description: 发票信息
+ * @Author :WYY
+ * @Date 2020/8/10
+ * @Version V1.0
+ **/
+@Mapper
+public interface PayInvoicePrintMapper {
+    Integer insert(PayInvoiceprinted payInvoiceprinted);
+
+    Integer update(@Param("payInvoiceprinted") PayInvoiceprinted payInvoiceprinted);
+
+    PayInvoiceprinted findInvoiceByPayseriesno(@Param("invoicePrintId") String invoicePrintId, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    List<PayInvoiceprinted> findListByState();
+
+    Integer updateReceivedIsPrint(@Param("isPrint") Boolean isPrint, @Param("payseriesno") String payseriesno, @Param("customerId") BigInteger customerId);
+
+    List<PayfeeInvoicePrintDto> findList(@Param("payInvoiceSearchDto") PayInvoiceSearchDto payInvoiceSearchDto, @Param("userCondition") UserCondition userCondition);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayMessagesendrecordMapper.java

@@ -0,0 +1,39 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.PayDebtMessageDto;
+import com.zcxk.rmcp.pay.dto.pay.PayMessagesendrecordDto;
+import com.zcxk.rmcp.pay.entity.ProgramItem;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * @Author wangli
+ * 2020-04-21 11:03
+ * @Description
+ * @Version 1.0
+ */
+@Mapper
+public interface PayMessagesendrecordMapper {
+
+    //插入短信发送记录
+    void insert(PayMessagesendrecordDto payMessagesendrecordDto);
+
+    //短信发送记录
+    List<PayMessagesendrecordDto> findList(PayMessagesendrecordDto payMessagesendrecordDto);
+
+    //获取用户欠费信息
+    List<PayDebtMessageDto> findDebtList(
+            @Param("year") Integer year,
+            @Param("month") Integer month,
+            @Param("condition") String condition,
+            @Param("beginDebtFee") BigDecimal beginDebtFee,
+            @Param("endDebtFee") BigDecimal endDebtFee,
+            @Param("accountIds") List<BigInteger> accountIds,
+            @Param("siteId") Integer siteId,
+            @Param("customerId") Integer customerId,
+            @Param("programItems") List<ProgramItem> programItems);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayMessagetemplateMapper.java

@@ -0,0 +1,23 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.PayMessageTemplateDto;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * @Author wangli
+ * 2020-04-21 10:54
+ * @Description
+ * @Version 1.0
+ */
+@Mapper
+public interface PayMessagetemplateMapper {
+    void insert(PayMessageTemplateDto payMessageTemplateDto);
+    void update(PayMessageTemplateDto payMessageTemplateDto);
+    void delete(@Param("id") BigInteger id);
+    PayMessageTemplateDto get(@Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId, @Param("sendType") Integer sendType, @Param("operationType") Integer operationType);
+    List<PayMessageTemplateDto> getAllMessageTemplate(PayMessageTemplateDto payMessageTemplateDto);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayMeterMapper.java

@@ -0,0 +1,10 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * Crated by Zjy on 2020-04-28 11:41
+ */
+@Mapper
+public interface PayMeterMapper {
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayPayAgentbranchMapper.java

@@ -0,0 +1,33 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.dto.pay.PayPayAgentbranchSelectDto;
+import com.zcxk.rmcp.pay.entity.pay.PayPayAgentbranch;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by Zjy on 2020/4/25 10:26
+ */
+@Mapper
+public interface PayPayAgentbranchMapper {
+
+    int insert(@Param("payPayAgentbranch") PayPayAgentbranch payPayAgentbranch);
+
+    int update(@Param("payPayAgentbranch") PayPayAgentbranch payPayAgentbranch);
+
+    int delete(@Param("id") BigInteger id, @Param("updateBy") BigInteger updateBy, @Param("updateDate") LocalDateTime updateDate);
+
+    List<PayPayAgentbranch>findList(@Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+
+    //判断数据是否存在
+    List<Long> ExitsData(@Param("id") String id, @Param("name") String name, @Param("code") String code, @Param("appid") String appid, @Param("mchid") String mchid, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    List<PayPayAgentbranchSelectDto> getAll(@Param("questParams") String questParams, @Param("tenantId") String tenantId, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("userCondition") UserCondition userCondition);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayPayCheckbalanceMapper.java

@@ -0,0 +1,37 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+
+import com.zcxk.rmcp.pay.dto.pay.PayBaseAccountTransactionsDto;
+import com.zcxk.rmcp.pay.dto.pay.PayPayCheckbalanceItemDto;
+import com.zcxk.rmcp.pay.entity.pay.BaseClosingAccountInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * Crated by Zjy on 2020-04-29 17:07
+ */
+@Mapper
+public interface PayPayCheckbalanceMapper {
+
+    //查询年度下所有帐期
+    List<BaseClosingAccountInfo>findClosingAccount(@Param("year") String year, @Param("month") String month, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    //按月帐期取系统总额
+    List<PayPayCheckbalanceItemDto>findSysMonthCycle(@Param("cycle") String cycle, @Param("stTime") LocalDateTime stTime, @Param("endTime") LocalDateTime endTime, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    //按帐期取交易总额
+    List<PayPayCheckbalanceItemDto>findTradeMonthCycle(@Param("cycle") String cycle, @Param("stTime") LocalDateTime stTime, @Param("endTime") LocalDateTime endTime, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    //按帐期取每天系统总额
+    List<PayPayCheckbalanceItemDto>findSysDay2Cycle(@Param("cycle") String cycle, @Param("stTime") LocalDateTime stTime, @Param("endTime") LocalDateTime endTime, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    //按帐期取每天交易总额
+    List<PayPayCheckbalanceItemDto>findTradeDay2Cycle(@Param("cycle") String cycle, @Param("stTime") LocalDateTime stTime, @Param("endTime") LocalDateTime endTime, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    //查询交易明细,条件：交易信息、支付类型、支付方式、交易时间
+    List<PayBaseAccountTransactionsDto>findTradeDetail(@Param("name") String name, @Param("payway") String payway, @Param("transtype") String transtype, @Param("stTime") LocalDateTime stTime, @Param("endTime") LocalDateTime endTime, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayPayReceivableMapper.java

@@ -0,0 +1,88 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.dto.pay.PayPayReceivableDto;
+import com.zcxk.rmcp.pay.entity.pay.PayPayReceived;
+import com.zcxk.rmcp.pay.entity.pay.PayPayRechargeaccount;
+import com.zcxk.rmcp.pay.entity.pay.PayReceivable;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * @Author: xjh
+ * @Date: 2020/4/26 9:36
+ */
+@Mapper
+public interface PayPayReceivableMapper {
+    int add(@Param("payReceivable") PayReceivable payReceivable);
+
+    List<PayPayReceivableDto> findList(PayPayReceivableDto dto);
+
+    List<PayPayReceivableDto> findGroupList(@Param("payPayReceivableDto") PayPayReceivableDto payPayReceivableDto, @Param("userCondition") UserCondition userCondition);
+
+    List<PayPayReceivableDto> findListInfo(PayPayReceivableDto payPayReceivableDto);
+
+    PayPayReceived queryReceivedInfo(@Param("receibableId") BigInteger receibableId, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId,
+                                     @Param("year") Integer year, @Param("month") Integer month);
+
+    List<PayPayReceived> queryReceivedSum(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId,
+                                          @Param("year") Integer year, @Param("month") Integer month, @Param("payseriesno") String payseriesno);
+
+    List<PayPayReceived> queryReceivedPayseriesno(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId,
+                                                  @Param("year") Integer year, @Param("month") Integer month, @Param("accountnumber") String accountnumber);
+
+    int delete(@Param("id") BigInteger id);
+
+    int updateAmountState(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId,
+                          @Param("year") Integer year, @Param("month") Integer month, @Param("accountnumber") String accountnumber);
+
+    int updateLadderlevelAmount1(@Param("siteId") Integer siteId,
+                                 @Param("customerId") Integer customerId,
+                                 @Param("flag") Integer flag,
+                                 @Param("payAmount") BigDecimal payAmount,
+                                 @Param("accountnumber") String accountnumber);
+    int updateLadderlevelAmount2(@Param("siteId") Integer siteId,
+                                 @Param("customerId") Integer customerId,
+                                 @Param("flag") Integer flag,
+                                 @Param("payAmount") BigDecimal payAmount,
+                                 @Param("accountnumber") String accountnumber);
+    int updateLadderlevelAmount3(@Param("siteId") Integer siteId,
+                                 @Param("customerId") Integer customerId,
+                                 @Param("flag") Integer flag,
+                                 @Param("payAmount") BigDecimal payAmount,
+                                 @Param("accountnumber") String accountnumber);
+    int updateLadderlevelAmount4(@Param("siteId") Integer siteId,
+                                 @Param("customerId") Integer customerId,
+                                 @Param("flag") Integer flag,
+                                 @Param("payAmount") BigDecimal payAmount,
+                                 @Param("accountnumber") String accountnumber);
+
+    int updateRegressionMoney(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId,
+                              @Param("receivedamount") BigDecimal receivedamount, @Param("accountId") BigInteger accountId);
+
+    int deleteReceived(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId,
+                       @Param("year") Integer year, @Param("month") Integer month, @Param("accountnumber") String accountnumber);
+
+    int deleteReceivable(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("year") Integer year,
+                         @Param("month") Integer month, @Param("payseriesno") String payseriesno);
+
+    int deleteTran(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId,
+                   @Param("year") Integer year, @Param("month") Integer month, @Param("accountnumber") String accountnumber);
+
+    PayPayReceivableDto getAccountNumber(@Param("id") BigInteger id);
+
+    PayPayRechargeaccount getBeforeBemaining(@Param("accountnumber") String accountnumber);
+
+    List<PayReceivable> getReceivableByAmountId(@Param("amountId") BigInteger amountId);
+
+    List<PayPayReceivableDto> querReceiveldPayseriesno(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("payseriesno") String payseriesno);
+
+    BigDecimal querySumTransamount(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId,
+                                   @Param("year") Integer year, @Param("month") Integer month, @Param("accountnumber") String accountnumber);
+
+    BigDecimal getHistoryDebt(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("accountid") BigInteger accountid);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayPayReceivedMapper.java

@@ -0,0 +1,47 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.dto.pay.PayPayReceivedDto;
+import com.zcxk.rmcp.pay.dto.pay.PayPayReceivedListDto;
+import com.zcxk.rmcp.pay.dto.pay.PayReceivedInvoiceDto;
+import com.zcxk.rmcp.pay.entity.pay.PayPayReceived;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @program: smart_city
+ * @description: 实收信息Mapper
+ * @author: Yangyang.Wang
+ * @create: 2020-04-22 13:29
+ **/
+@Mapper
+public interface PayPayReceivedMapper {
+    List<PayPayReceivedListDto> findListByPayseriesno(PayPayReceived received);
+
+    List<PayPayReceivedListDto> findTotalList(@Param("received") PayPayReceived received, @Param("userCondition") UserCondition userCondition);
+
+    //返回id到实体中
+    void insert(PayPayReceived payPayReceived);
+
+    //查询当前实收批次号
+    public PayPayReceivedDto getReceivdePaySeriesno(@Param("id") BigInteger id);
+
+    public List<PayPayReceived> findBySeriesno(@Param("payseriesno") String payseriesno, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    public void updateDebtById(@Param("id") BigInteger id, @Param("debt") BigDecimal debt);
+
+    public void updateReceived(@Param("iscanceled") int iscanceled, @Param("canceltime") LocalDateTime canceltime,
+                               @Param("cancelperson") Integer cancelperson, @Param("id") BigInteger id);
+
+    void updateReceivedCancel(@Param("payseriesno") String payseriesno, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+    void cancelCheckAgentPayseriesno(@Param("payseriesno") String payseriesno, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    void update(PayPayReceived payReceived);
+
+    List<PayReceivedInvoiceDto> findInvoiceReceivedByPayseriesno(@Param("payseriesno") String payseriesno, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayPenaltyrecordMapper.java

@@ -0,0 +1,18 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.dto.pay.PayPenaltyrecordDto;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: xjh
+ * @Date: 2020/4/27 0027 14:21
+ */
+@Mapper
+public interface PayPenaltyrecordMapper {
+    List<PayPenaltyrecordDto> findList(@Param("payPenaltyrecordDto") PayPenaltyrecordDto payPenaltyrecordDto, @Param("userCondition") UserCondition userCondition);
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayRechargeaccountMapper.java

@@ -0,0 +1,41 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.dto.pay.PayRechargeaccountDto;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+
+
+/**
+ * @Author wangli
+ * 2020-04-20 14:00
+ * @Description
+ * @Version 1.0
+ */
+@Mapper
+public interface PayRechargeaccountMapper {
+
+    List<PayRechargeaccountDto> findList(@Param("payRechargeaccountDto") PayRechargeaccountDto payRechargeaccountDto, @Param("userCondition") UserCondition userCondition);
+
+    PayRechargeaccountDto findById(@Param("id") BigInteger id, @Param("accountId") BigInteger accountId);
+
+    PayRechargeaccountDto findByAccountInfo(PayRechargeaccountDto payRechargeaccountDto);
+
+    void update(PayRechargeaccountDto payRechargeaccountDto);
+
+    void insert(PayRechargeaccountDto payRechargeaccountDto);
+
+    void delete(BigInteger accountId);
+
+    void batchDelete(@Param("accountIds") List<BigInteger> accountIds);
+
+    int batchInsert(List<PayRechargeaccountDto> list);
+
+    void updateBalance(@Param("balance") BigDecimal balance, @Param("readdate") String readdate, @Param("id") BigInteger id);
+
+    public List<PayRechargeaccountDto> getEstimateBalance(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayReportMapper.java

@@ -0,0 +1,32 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.PayArrearagedetailsReportDto;
+import com.zcxk.rmcp.pay.dto.pay.PayOperatordetailsReportDto;
+import com.zcxk.rmcp.pay.dto.pay.PayTransactiondetailsReportDto;
+import com.zcxk.rmcp.pay.dto.pay.PayWaterPropertyReportDto;
+import com.zcxk.rmcp.pay.entity.pay.PayWaterPropertyReport;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: ZJY
+ * @DATE: 2020-07-28 13:49
+ */
+@Mapper
+public interface PayReportMapper {
+
+    List<PayTransactiondetailsReportDto>getPayTransactiondetailsReportList(PayTransactiondetailsReportDto inParams);
+
+    List<PayOperatordetailsReportDto>getPayOperatordetailsReportList(PayOperatordetailsReportDto inParams);
+
+    List<PayArrearagedetailsReportDto>getPayArrearagedetailsReportList(PayArrearagedetailsReportDto inParams);
+
+    List<PayWaterPropertyReportDto> getWaterPropertySaleReport(PayWaterPropertyReportDto inParams);
+
+    List<PayWaterPropertyReportDto> getTranInfoReport(@Param("inParams") PayWaterPropertyReport inParams);
+    List<PayWaterPropertyReportDto> getReceviceInfoReport(@Param("inParams") PayWaterPropertyReport inParams);
+
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PaySysDictMapper.java

@@ -0,0 +1,43 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.rmcp.pay.dto.pay.PaySysDictSelectDto;
+import com.zcxk.rmcp.pay.entity.pay.PaySysDict;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * Crated by Zjy on 2020-04-22 8:50
+ */
+@Mapper
+public interface PaySysDictMapper {
+
+    //@Select("select * from pay_sys_dict where del_flag = '0'")
+    List<PaySysDictSelectDto> getAll(@Param("value") String value, @Param("label") String label, @Param("type") String type, @Param("tenantId") String tenantId);
+
+    //根据值、标签模糊查询
+    List<PaySysDictSelectDto> findValueLabel(@Param("queryInfo") String queryInfo, @Param("type") String type, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    int insert(@Param("paySysDict") PaySysDict paySysDict);
+
+    int update(@Param("paySysDictDto") PaySysDict paySysDict);
+
+    int delete(@Param("id") BigInteger id, @Param("updateBy") BigInteger updateBy, @Param("updateDate") LocalDateTime updateDate);
+
+    Integer getDictValue(@Param("type") String type, @Param("label") String label, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    //根据类型查询
+    List<PaySysDictSelectDto> getDicts(@Param("type") String type, @Param("tenantId") String tenantId);
+
+    //查询所有类型
+    List<String>findAllType(@Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    String getDiceLabel(@Param("value") Integer value, @Param("type") String type, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    //判断数据是否存在 同一类型下，标签和值不能有相同
+    List<Long> ExitsData(@Param("id") String id, @Param("type") String type, @Param("value") String value, @Param("label") String label, @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/PayTransactiondetailsMapper.java

@@ -0,0 +1,40 @@
+package com.zcxk.rmcp.pay.dao.pay;
+
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.dto.pay.PayTransactiondetails;
+import com.zcxk.rmcp.pay.dto.pay.PayTransactiondetailsDto;
+import com.zcxk.rmcp.pay.entity.ProgramItem;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * @Author wangli
+ * 2020-04-21 8:38
+ * @Description
+ * @Version 1.0
+ */
+@Mapper
+public interface PayTransactiondetailsMapper {
+
+    void insert(PayTransactiondetails payTransactiondetails);
+    void batchInsert(@Param("list") List<PayTransactiondetails> list);
+
+    List<PayTransactiondetails> findList(PayTransactiondetails payTransactiondetails);
+
+    List<PayTransactiondetailsDto> selectTransactionList( PayTransactiondetailsDto payTransactiondetailsDto);
+
+    List<PayTransactiondetailsDto> selectTransactionListForAgenttrans(PayTransactiondetailsDto payTransactiondetailsDto);
+
+    PayTransactiondetails findByid(BigInteger id);
+
+    void updateCancelInfo(PayTransactiondetails payTransactiondetails);
+
+    List<PayTransactiondetails> findBySeriesno(@Param("payseriesno") String payseriesno, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("programItems") List<ProgramItem> programItems);
+
+    void updateLastRecreamaing(@Param("lastrecreamaing") BigDecimal lastrecreamaing, @Param("payseriesno") String payseriesno);
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dao/pay/archives/PayBaseCustomerandmeterrelaMapper.java

@@ -0,0 +1,112 @@
+package com.zcxk.rmcp.pay.dao.pay.archives;
+
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.dto.pay.PayBaseCustomerandmeterrelaDto;
+import com.zcxk.rmcp.pay.dto.pay.PayCustomerDto;
+import com.zcxk.rmcp.pay.entity.Organization;
+import com.zcxk.rmcp.pay.entity.pay.PayBaseAccount;
+import com.zcxk.rmcp.pay.entity.pay.PayControlRule;
+import com.zcxk.rmcp.pay.entity.pay.PayControlValve;
+import com.zcxk.rmcp.pay.entity.pay.PayPayRechargeaccount;
+import com.zcxk.rmcp.pay.entity.pay.archives.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: xjh
+ * @Date: 2020/4/17 0017
+ */
+@Mapper
+public interface PayBaseCustomerandmeterrelaMapper {
+
+    PayBaseCustomerandmeterrela queryDevice();
+
+    public PayBaseAccount getAccountId(@Param("tenantId") String tenantId, @Param("accountnumber") String accountnumber);
+
+    public PayBaseCustomerandmeterrela getDeviceId(@Param("tenantId") String tenantId, @Param("metercode") String metercode);
+
+    public PayBaseCustomerandmeterrela getWaterPropertyId(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("name") String name);
+    public int insertList(@Param("customers") List<PayBaseCustomerandmeterrela> customers);
+
+    public int insertValveList(@Param("valve") List<PayControlValve> valve);
+
+    public Organization getOfficeId(@Param("siteId") Integer siteId, @Param("name") String name);
+
+    public List<PayBaseCustomerandmeterrela> findList(PayBaseCustomerandmeterrela customer);
+
+    public Double  meterAllDebt(@Param("meterid") BigInteger meterid);
+
+    public PayPayRechargeaccount findByAccount(@Param("accountId") BigInteger accountId);
+
+    public int updateCustomerState(@Param("state") Integer state, @Param("updateBy") Integer updateBy, @Param("date") Date date,
+                                   @Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("id") BigInteger id);
+
+    public int updateRechargeAccountState(@Param("state") Integer state, @Param("updateBy") Integer updateBy, @Param("date") Date date,
+                                          @Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("id") BigInteger id);
+
+    public int updateAccountState(@Param("state") Integer state, @Param("updateBy") Integer updateBy, @Param("date") Date date,
+                                  @Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("id") BigInteger id);
+
+    public int updateDeviceState(@Param("state") Integer state, @Param("updateBy") Integer updateBy, @Param("date") Date date,
+                                 @Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("metercode") String metercode);
+
+    public List<PayBaseCustomerandmeterrela> getList(@Param("condition") String condition, @Param("waterPropertyId") BigInteger waterPropertyId,
+                                                     @Param("businessstate") Integer businessstate, @Param("calculateway") Integer calculateway, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    public List<DeviceListInfo> queryNoOpenAccount(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    public List<MeterListInfo> selectAccountInfo(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("accountnumber") String accountnumber);
+
+    List<CustomerListInfo> selectAccountWater(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("accountnumber") String accountnumber);
+
+    public List<MeterListInfo> queryMetercode(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+    public List<PayAccountInfo> selectAccountMeterInfo(@Param("tenantId") String tenantId, @Param("metercode") String metercode);
+    public List<PayAccountInfo> selectMeterElenoMeterInfo(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("metereleno") String metereleno);
+
+    public int updateAccountInfo(@Param("accountname") String accountname, @Param("accountnumber") String accountnumber, @Param("metercode") String metercode, @Param("idtype") Integer idtype,
+                                 @Param("idcardno") String idcardno, @Param("telephone") String telephone, @Param("officeId") BigInteger officeId,
+                                 @Param("housetype") Integer housetype, @Param("customergroup") Integer customergroup, @Param("updateBy") Integer updateBy,
+                                 @Param("date") Date date, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    public int updateCustomerInfo(@Param("accountname") String accountname, @Param("accountnumber") String accountnumber, @Param("metercode") String metercode, @Param("idtype") Integer idtype,
+                                  @Param("idcardno") String idcardno, @Param("telephone") String telephone, @Param("officeId") BigInteger officeId,
+                                  @Param("housetype") Integer housetype, @Param("customergroup") Integer customergroup, @Param("updateBy") Integer updateBy,
+                                  @Param("date") Date date, @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    public List<PayCustomerDto> getAll(PayBaseCustomerandmeterrela payBaseCustomerandmeterrela, UserCondition userCondition);
+
+    void updateBaseAccountInfo(@Param("address") String address, @Param("telephone") String telephone,
+                               @Param("idtype") Integer idtype, @Param("idcardno") String idcardno, @Param("accountnumber") String accountnumber,
+                               @Param("siteId") BigInteger siteId, @Param("customerId") BigInteger customerId);
+
+    Integer queryWaterUserdStateCount(@Param("id") BigInteger id);
+
+    PayBaseCustomerandmeterrela get(@Param("id") BigInteger id);
+
+    void update(PayBaseCustomerandmeterrela payBaseCustomerandmeterrela);
+
+    public  List<PayBaseCustomerandmeterrelaDto> getResetLadderList(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
+
+    public int queryCustomerInfo(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId,
+                                 @Param("accountnumber") String accountnumber, @Param("metercode") String metercode);
+
+    public PayBaseCustomerandmeterrela queryCancelInfo(@Param("tenantId") String tenantId,
+                                                       @Param("accountnumber") String accountnumber, @Param("metercode") String metercode);
+
+    public Organization getParentOfficeId(@Param("siteId") Integer siteId, @Param("id") Integer id, @Param("name") String name);
+
+    public PayBaseCustomerandmeterrela findAccountByAccountNumber(@Param("siteId") Integer siteId, @Param("customerId") Integer customerId, @Param("accountnumber") String accountnumber);
+
+    void updateMeterInstallOpen(@Param("isAccepted") Integer isAccepted, @Param("updateBy") String updateBy, @Param("date") LocalDateTime date, @Param("id") BigInteger id);
+
+    public List<PayControlRule> getRuleNames(@Param("tenantId") String tenantId, @Param("list") List<String> list);
+
+    void insertValve(@Param("deviceId") BigInteger deviceId, @Param("date") LocalDateTime date, @Param("controlState") int controlState, @Param("controlRuleId") int controlRuleId);
+
+    PayBaseCustomerandmeterrela getAccountCustomer(@Param("id") BigInteger id);
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/AreaDto.java

@@ -0,0 +1,18 @@
+package com.zcxk.rmcp.pay.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by ZJY on 2020-09-27 9:29
+ */
+@Data
+@ApiModel("区域")
+public class AreaDto {
+    private Integer code;
+    private Integer pid;
+    private String name;
+    private List<AreaDto> children;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/AreaRelevanceDto.java

@@ -0,0 +1,17 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Area;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class AreaRelevanceDto extends Area {
+    @ApiModelProperty(value="属性1")
+    private String property1;
+
+    @ApiModelProperty(value="属性2")
+    private String property2;
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/BuildingSelectDto.java

@@ -0,0 +1,42 @@
+package com.zcxk.rmcp.pay.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by ZJY on 2020-10-10 17:10
+ */
+
+@Data
+public class BuildingSelectDto implements Serializable {
+    private static final long serialVersionUID = -3204557875996317038L;
+    @ApiModelProperty(value = "code", position = 1)
+    private Integer code;
+
+    @ApiModelProperty(value = "父类", position = 2)
+    private Integer pid;
+
+    @ApiModelProperty(value = "名称", position = 3)
+    private String name;
+
+    @ApiModelProperty(value="维度编码", position = 4)
+    private String dimensionCode;
+
+    @ApiModelProperty(value = "状态", position = 5)
+    private Integer status;
+
+    @ApiModelProperty(value = "数量统计", position = 6)
+    private Integer num;
+
+    @ApiModelProperty(value = "经度", position = 7)
+    private Double longitude;
+
+    @ApiModelProperty(value = "纬度", position = 8)
+    private Double latitude;
+
+    @ApiModelProperty(value = "子类", position = 9)
+    private List<BuildingSelectDto> children;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/ChannelDeviceCountDto.java

@@ -0,0 +1,15 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Channel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@ApiModel
+@EqualsAndHashCode(callSuper=false)
+public class ChannelDeviceCountDto extends Channel {
+    @ApiModelProperty("数量统计")
+    private Integer num;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/ChannelDto.java

@@ -0,0 +1,24 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Channel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@ApiModel("场景系统")
+@EqualsAndHashCode(callSuper=false)
+public class ChannelDto extends Channel {
+
+    @ApiModelProperty("是否选中")
+    private Integer isSelected ;
+
+    @ApiModelProperty("子集")
+    private List<ChannelDto> children;
+
+    @ApiModelProperty("设备类型id集合")
+    private List<Integer> deviceTypeIds;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/CommunityDto.java

@@ -0,0 +1,25 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Community;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@ApiModel
+@EqualsAndHashCode(callSuper=false)
+public class CommunityDto extends Community {
+    @ApiModelProperty(value = "省", position = 1)
+    private String provinceName;
+
+    @ApiModelProperty(value = "市", position = 2)
+    private String cityName;
+
+    @ApiModelProperty(value = "区", position = 3)
+    private String regionName;
+
+    @ApiModelProperty(value = "片区", position = 4)
+    private String districtName;
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/CustomerDto.java

@@ -0,0 +1,23 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Customer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@ApiModel
+@EqualsAndHashCode(callSuper=false)
+public class CustomerDto extends Customer {
+    @ApiModelProperty(value = "子类", position = 100)
+    private List<CustomerDto> children;
+
+    @ApiModelProperty(value = "子客户数", position = 101)
+    private Integer total;
+
+    @ApiModelProperty(value = "是否有子客户", position = 102)
+    private Boolean hasChildren;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/DeleteUserDto.java

@@ -0,0 +1,12 @@
+package com.zcxk.rmcp.pay.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DeleteUserDto {
+    @ApiModelProperty("用户id")
+    private List<Integer> userIds;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/DeviceDto.java

@@ -0,0 +1,142 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Device;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * Created by ZJY on 2020-09-27 8:43
+ */
+
+@Data
+@ApiModel
+@EqualsAndHashCode(callSuper=false)
+public class DeviceDto extends Device {
+
+    @ApiModelProperty(value = "系列", position = 100)
+    private String equipmentType;
+
+    @ApiModelProperty(value = "型号", position = 101)
+    private String model;
+
+    @ApiModelProperty(value = "厂商名称", position = 102)
+    private String manufacturerName;
+
+    @ApiModelProperty(value = "建筑名称", position = 103)
+    private String buildingName;
+
+    @ApiModelProperty(value = "系统名称", position = 103)
+    private String systemName;
+
+    @ApiModelProperty(value = "经度", position = 104)
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度", position = 105)
+    private String latitude;
+
+    @ApiModelProperty(value = "状态名称", position = 106)
+    private String deviceStatusName;
+
+    @ApiModelProperty(value = "省", position = 107)
+    private Integer province;
+
+    @ApiModelProperty(value = "省名称", position = 107)
+    private String provinceName ;
+
+    @ApiModelProperty(value = "市", position = 108)
+    private Integer city;
+
+    @ApiModelProperty(value = "市名称", position = 108)
+    private String cityName ;
+
+    @ApiModelProperty(value = "区", position = 109)
+    private Integer region ;
+
+    @ApiModelProperty(value = "区名称", position = 109)
+    private String regionName ;
+
+    @ApiModelProperty(value = "小区", position = 110)
+    private Integer community;
+
+    @ApiModelProperty(value = "小区", position = 110)
+    private String communityName;
+
+    @ApiModelProperty(value = "集中器", position = 111)
+    private String concentratorName;
+
+    @ApiModelProperty(value = "采集器", position = 112)
+    private String collectorName;
+
+    @ApiModelProperty(value = "告警类型", position = 114)
+    private String lastErrorType;
+
+    @ApiModelProperty(value = "连续故障天数", position = 115)
+    private Integer days = 0;
+
+    @ApiModelProperty(value = "客户名称", position = 116)
+    private String customerName;
+
+    @ApiModelProperty(value = "客户id", position = 116)
+    private Integer customerId ;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "计划时间", position = 117)
+    private LocalDateTime planTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "安装时间", position = 118)
+    private LocalDateTime installTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "验收时间", position = 119)
+    private LocalDateTime acceptTime;
+
+    @ApiModelProperty(value = "新表起度", position = 120)
+    private String newMeterStart;
+
+    @ApiModelProperty(value = "水表读数", position = 121)
+    private String meterReading;
+
+    @ApiModelProperty(value = "安装主键", position = 122)
+    private Integer installId ;
+
+    @ApiModelProperty(value = "旧表止度",position = 123)
+    private String oldMeterEnd;
+
+    @ApiModelProperty(value="阀门状态 0：关阀 1：开阀",position = 124)
+    private Integer valveStatus = 1;
+
+    @ApiModelProperty(value="阀门按钮状态 0：关阀 1：开阀",position = 125)
+    private Integer valveButtonStatus = 1;
+
+    @ApiModelProperty(value="是否有无阀门 0：无 1：有",position = 125)
+    private Integer isValve;
+
+    @ApiModelProperty(value="是否需要注册 0：否：是",position = 125)
+    private Integer isRegister;
+
+    @ApiModelProperty(value="参考集中器表",position = 126)
+    private Integer concentratorId;
+
+    @ApiModelProperty(value="参考采集器表",position = 127)
+    private Integer collectorId;
+
+
+    @ApiModelProperty(value="通道号id",position = 128)
+    private Integer channelNumberId;
+
+    @ApiModelProperty(value="通道号",position = 129)
+    private String channelNumberName;
+
+    @ApiModelProperty(value="测量点号",position = 130)
+    private String port;
+
+    @ApiModelProperty(value="下发状态 0：未下发 1：已下发",position = 131)
+    private Integer issueStatus;
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/DeviceSyncDto.java

@@ -0,0 +1,43 @@
+package com.zcxk.rmcp.pay.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by ZJY on 2020-09-28 11:27
+ */
+@Data
+@ApiModel
+public class DeviceSyncDto {
+
+    @ApiModelProperty(value = "设备编号")
+    private	String	deviceNo;
+
+    @ApiModelProperty(value = "地址")
+    private	String	locDesc;
+
+    @ApiModelProperty(value = "客户ID")
+    private	Integer	customerId;
+
+    @ApiModelProperty(value = "水表电子号")
+    private	String	waterMeterNo;
+
+    @ApiModelProperty(value = "状态")
+    private	Integer	status;
+
+    @ApiModelProperty(value = "创建日期")
+    private	String	dateCreate;
+
+    @ApiModelProperty(value = "更新日期")
+    private	String	dateUpdate;
+
+    @ApiModelProperty(value = "水表档案")
+    private	String	fileNo;
+
+    @ApiModelProperty(value = "初始读数")
+    private	String	initialData;
+
+    @ApiModelProperty(value = "设备类型")
+    private	String	deviceType;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/DeviceTypeDto.java

@@ -0,0 +1,48 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.DeviceMeasuringPoint;
+import com.zcxk.rmcp.pay.entity.DeviceType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by ZJY on 2020-09-27 9:42
+ */
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class DeviceTypeDto extends DeviceType implements Serializable {
+
+    private static final long serialVersionUID = -4248786000656508924L;
+
+    @ApiModelProperty(value = "厂商名称", position = 100, hidden = true)
+    private String manufacturerName;
+
+    @ApiModelProperty(value = "厂商英文名称", position = 100, hidden = true)
+    private String enManufacturerName;
+
+    @ApiModelProperty(value = "英文系列", position = 100, hidden = true)
+    private String enEquipmentType;
+
+    @ApiModelProperty(value = "英文型号", position = 100, hidden = true)
+    private String enModel;
+
+    @ApiModelProperty(value = "关联Agent", position = 100, hidden = true)
+    private String agentIdentifier;
+
+    @ApiModelProperty(value = "所属系统名称", position = 101, hidden = true)
+    private String channelName;
+
+    @ApiModelProperty(value = "所属场景，水务专用")
+    private Integer channelId;
+
+    @ApiModelProperty(value = "测点", position = 102, hidden = true)
+    private List<DeviceMeasuringPoint> measuringPoint;
+
+    @ApiModelProperty(value = "测点id集合", position = 103)
+    private List<Integer> measuringPointId;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/DimensionDataDto.java

@@ -0,0 +1,37 @@
+package com.zcxk.rmcp.pay.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel
+public class DimensionDataDto {
+
+    @ApiModelProperty(value = "省", position = 1)
+    private List<DimensionDataItemDto> provinceList;
+
+    @ApiModelProperty(value = "市", position = 2)
+    private List<DimensionDataItemDto> cityList;
+
+    @ApiModelProperty(value = "区", position = 3)
+    private List<DimensionDataItemDto> regionList;
+
+    @ApiModelProperty(value = "小区", position = 4)
+    private List<DimensionDataItemDto> communityList;
+
+    @ApiModelProperty(value = "楼栋", position = 5)
+    private List<DimensionDataItemDto> buildingList;
+
+    @ApiModelProperty(value = "设备", position = 6)
+    private List<DimensionDataItemDto> deviceList;
+
+    @ApiModelProperty(value = "客户", position = 7)
+    private List<DimensionDataItemDto> customerList;
+
+    @ApiModelProperty(value = "项目", position = 8)
+    private List<DimensionDataItemDto> projectList;
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/DimensionDataItemDto.java

@@ -0,0 +1,30 @@
+package com.zcxk.rmcp.pay.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class DimensionDataItemDto {
+    @ApiModelProperty(value = "id", position = 1)
+    private String id;
+
+    @ApiModelProperty(value = "省", position = 1)
+    private String provinceName;
+
+    @ApiModelProperty(value = "市", position = 2)
+    private String cityName;
+
+    @ApiModelProperty(value = "区", position = 3)
+    private String regionName;
+
+    @ApiModelProperty(value = "小区", position = 4)
+    private String communityName;
+
+    @ApiModelProperty(value = "名称", position = 6)
+    private String name;
+
+    @ApiModelProperty(value="维度编码，参考sc_dimension表code", position = 7)
+    private String dimensionCode;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/ImageCode.java

@@ -0,0 +1,38 @@
+package com.zcxk.rmcp.pay.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.ToString;
+
+import java.awt.image.BufferedImage;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 验证码图片
+ */
+@Data
+@ToString
+@AllArgsConstructor
+public class ImageCode implements Serializable {
+
+    private static final long serialVersionUID = -5390786701941159803L;
+
+    private BufferedImage image;
+    private String code;
+    private LocalDateTime expireTime;
+
+    public ImageCode(BufferedImage image, String code, int expireInt) {
+        this.image = image;
+        this.code = code;
+        this.expireTime = LocalDateTime.now().plusSeconds(expireInt);
+    }
+
+    /**
+     * 是否过期
+     * @return
+     */
+    public boolean isExpried() {
+        return LocalDateTime.now().isAfter(expireTime);
+    }
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/LoginUser.java

@@ -0,0 +1,182 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.core.common.pojo.ProgramItem;
+import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.pay.entity.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Getter
+@Setter
+public class LoginUser extends User implements UserDetails {
+
+    private static final long serialVersionUID = 2688116832144932826L;
+    private Integer siteId;
+    private Integer customerId;
+
+    @ApiModelProperty(value="id")
+    private Integer id;
+
+    @ApiModelProperty(value="用户名")
+    private String username;
+
+    @ApiModelProperty(value="姓名")
+    private String name;
+
+    @ApiModelProperty(value="手机号码")
+    private String phoneNumber;
+
+    @ApiModelProperty(value="类型,1超级管理员，-999站点管理员，2普通用户")
+    private String type;
+    @ApiModelProperty(value="公司id")
+    private Integer companyId;
+    @ApiModelProperty(value="部门id")
+    private Integer departmentId;
+
+
+    @ApiModelProperty(value="租户标识")
+    private String tenantId;
+
+    @ApiModelProperty(value="用户权限类型")
+    private Integer permissonType;
+
+    @ApiModelProperty(value="用户角色id")
+    private Integer roleId;
+
+    @JsonIgnore
+    private String loginToken;
+    private String updateBy;
+    private Integer currentSiteId;
+    private Map<String,List< com.zcxk.rmcp.pay.entity.ProgramItem>>dataPermissionMap;
+    private Integer siteType;
+
+    /**
+     * 数据权限
+     */
+    private List<ProgramItem> programItemList;
+
+    /**
+     * 同一个手机号下的所有用户信息
+     */
+    @JsonIgnore
+    private String userInfos;
+
+    private List<String>appIds;
+
+    /**
+     * 权限
+     */
+    private Set<GrantedAuthority> authorities;
+    private List<Site>siteList;
+    public LoginUser(){
+
+    }
+    public LoginUser(Set<GrantedAuthority> authorities) {
+        this.authorities = authorities;
+    }
+
+    public LoginUser(Integer id, String username, String phoneNumber, String type, String tenantId, Set<GrantedAuthority> authorities) {
+        this.id = id;
+        this.username = username;
+        this.phoneNumber = phoneNumber;
+        this.type = type;
+        this.tenantId = tenantId;
+        this.authorities = Collections.unmodifiableSet(sortAuthorities(authorities));
+    }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return this.authorities;
+    }
+
+    @JsonIgnore
+    @Override
+    public String getPassword() {
+        return null;
+    }
+
+    private static SortedSet<GrantedAuthority> sortAuthorities(Collection<? extends GrantedAuthority> authorities) {
+        Assert.notNull(authorities, "Cannot pass a null GrantedAuthority collection");
+        SortedSet<GrantedAuthority> sortedAuthorities = new TreeSet(new AuthorityComparator());
+        Iterator var2 = authorities.iterator();
+
+        while(var2.hasNext()) {
+            GrantedAuthority grantedAuthority = (GrantedAuthority)var2.next();
+            Assert.notNull(grantedAuthority, "GrantedAuthority list cannot contain any null elements");
+            sortedAuthorities.add(grantedAuthority);
+        }
+
+        return sortedAuthorities;
+    }
+
+    @JsonIgnore
+    @Override
+    public boolean isAccountNonExpired() {
+        return true;
+    }
+
+    @JsonIgnore
+    @Override
+    public boolean isAccountNonLocked() {
+        return true;
+    }
+
+    @JsonIgnore
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return true;
+    }
+
+    @JsonIgnore
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+
+
+    private static class AuthorityComparator implements Comparator<GrantedAuthority>, Serializable {
+        private static final long serialVersionUID = 500L;
+
+        private AuthorityComparator() {
+        }
+
+        @Override
+        public int compare(GrantedAuthority g1, GrantedAuthority g2) {
+            if (g2.getAuthority() == null) {
+                return -1;
+            } else {
+                return g1.getAuthority() == null ? 1 : g1.getAuthority().compareTo(g2.getAuthority());
+            }
+        }
+    }
+
+    public void setAuthorities(Set<GrantedAuthority> authorities) {
+        this.authorities = Collections.unmodifiableSet(sortAuthorities(authorities));
+    }
+
+    public UserCondition getUserCondition(){
+        UserCondition queryCondition = new UserCondition();
+        queryCondition.setTenantId(getTenantId());
+        queryCondition.setProgramItems(getProgramItemList());
+        queryCondition.setUserType(getType());
+        queryCondition.setPermissionType(getPermissonType());
+        return queryCondition;
+    }
+
+
+
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/MeterSyncDto.java

@@ -0,0 +1,55 @@
+package com.zcxk.rmcp.pay.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by ZJY on 2020-09-28 15:15
+ */
+@Data
+@ApiModel
+public class MeterSyncDto {
+    @ApiModelProperty(value = "设备编号")
+    private	String	deviceNo;
+
+    @ApiModelProperty(value = "地址")
+    private	String	locDesc;
+
+    @ApiModelProperty(value = "客户ID")
+    private	Integer	customerId;
+
+    @ApiModelProperty(value = "水表电子号")
+    private	String	waterMeterNo;
+
+    @ApiModelProperty(value = "状态")
+    private	Integer	status;
+
+    @ApiModelProperty(value = "设备状态")
+    private	Integer	deviceStatus;
+
+    @ApiModelProperty(value = "故障天数")
+    private	Integer	days;
+
+    @ApiModelProperty(value = "创建时间")
+    private	String	dateCreate;
+
+    @ApiModelProperty(value = "更新时间")
+    private	String	dateUpdate;
+
+    @ApiModelProperty(value = "水表档案号")
+    private	String	fileNo;
+
+    @ApiModelProperty(value = "计费系统水表档案号")
+    private	String	meterCode ;
+
+    @ApiModelProperty(value = "水表起度")
+    private	String	initialData;
+
+    @ApiModelProperty(value = "设备型号")
+    private	String	deviceType;
+
+    @ApiModelProperty(value = "水表当前状态，0未安装1已安装2已开户")
+    private Integer currStatus;
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/MeterSyncInputDto.java

@@ -0,0 +1,21 @@
+package com.zcxk.rmcp.pay.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by ZJY on 2020-09-28 14:44
+ */
+@Data
+@ApiModel
+public class MeterSyncInputDto {
+    @ApiModelProperty(value = "创建日期 格式：yyyyMMdd")
+    private String createDate;
+    @ApiModelProperty(value = "客户编码,即抄表系统中的customer_no")
+    private String customerNo;
+    @ApiModelProperty(value = "水表档案号,即sc_device表中的metercode")
+    private List<String> fileNo;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/OrganizationDto.java

@@ -0,0 +1,18 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Organization;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@ApiModel
+@EqualsAndHashCode(callSuper = false)
+public class OrganizationDto extends Organization {
+
+    @ApiModelProperty(value = "子类", position = 100)
+    private List<OrganizationDto> children;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/PersonTypeChannelDto.java

@@ -0,0 +1,20 @@
+package com.zcxk.rmcp.pay.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PersonTypeChannelDto {
+
+    @ApiModelProperty(value = "场景ID")
+    private int channelId;
+
+    @ApiModelProperty(value = "新增的人员类型ID集合")
+    private int[] insertPersonTypeList;
+
+    @ApiModelProperty(value = "删除失效的人员类型ID，以,号隔开")
+    private int[] delPersonTypeIds;
+
+    @ApiModelProperty(value = "生效的人员类型ID，以,号隔开")
+    private int[] updPersonTypeIds;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/PersonTypeChannelListDto.java

@@ -0,0 +1,17 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.PersonTypeChannel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class PersonTypeChannelListDto extends PersonTypeChannel {
+
+    @ApiModelProperty(value = "人员类型名称")
+    private String personTypeName;
+
+    @ApiModelProperty(value = "维度ID")
+    private String dimensionIds;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/PersonTypeDefDto.java

@@ -0,0 +1,17 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.PersonTypeDef;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class PersonTypeDefDto extends PersonTypeDef {
+
+    @ApiModelProperty(value = "关联维度")
+    private String dimensions;
+
+    @ApiModelProperty(value = "生效维度ID集合")
+    private int[] dimensionList;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/ProgramDto.java

@@ -0,0 +1,41 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Program;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@ApiModel
+@EqualsAndHashCode(callSuper=false)
+public class ProgramDto extends Program {
+    @ApiModelProperty(value = "省", position = 100)
+    private List<DimensionDataItemDto> provinceList;
+
+    @ApiModelProperty(value = "市", position = 101)
+    private List<DimensionDataItemDto> cityList;
+
+    @ApiModelProperty(value = "区", position = 102)
+    private List<DimensionDataItemDto> regionList;
+
+    @ApiModelProperty(value = "小区", position = 103)
+    private List<DimensionDataItemDto> communityList;
+
+    @ApiModelProperty(value = "建筑", position = 104)
+    private List<DimensionDataItemDto> buildingList;
+
+    @ApiModelProperty(value = "客户", position = 105)
+    private List<DimensionDataItemDto> customerList;
+
+    @ApiModelProperty(value = "项目", position = 106)
+    private List<DimensionDataItemDto> projectList;
+
+    @ApiModelProperty(value = "组织机构",notes = "OFFICE_ID", position = 107)
+    private List<DimensionDataItemDto> orgList;
+
+    @ApiModelProperty(value = "权限范围")
+    private String items;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/ProgramItemDto.java

@@ -0,0 +1,19 @@
+package com.zcxk.rmcp.pay.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class ProgramItemDto {
+
+    @ApiModelProperty(value = "维度类型ID")
+    private int dimensionId;
+
+    @ApiModelProperty(value = "维度id值")
+    private int dimensionValue;
+
+    @ApiModelProperty(value = "生效维度ID集合")
+    private String dimensionName;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/RoleDto.java

@@ -0,0 +1,13 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Role;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RoleDto extends Role {
+
+    //@ApiModelProperty("权限id")
+    //private List<Integer> pids;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/SiteDto.java

@@ -0,0 +1,31 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Site;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SiteDto extends Site {
+
+    @ApiModelProperty("用户id")
+    private List<Integer> userIds;
+
+    @ApiModelProperty(value = "用户名称", hidden = true)
+    private String username;
+
+    @ApiModelProperty(value = "建筑数")
+    private Integer buildingCount;
+
+    @ApiModelProperty(value = "设备数")
+    private Integer deviceCount;
+
+    @ApiModelProperty(value = "权限id",position = 101)
+    private List<Integer> permissionIds;
+
+    @ApiModelProperty(value ="栏目id", position = 102)
+    private List<Integer> channelIds;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/SiteUserDto.java

@@ -0,0 +1,10 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Site;
+import lombok.Data;
+
+@Data
+public class SiteUserDto extends Site {
+
+    private Integer userType;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/UserDto.java

@@ -0,0 +1,22 @@
+package com.zcxk.rmcp.pay.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UserDto {
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("用户名称")
+    private String username;
+
+    @ApiModelProperty("用户真实姓名")
+    private String realname;
+
+    @ApiModelProperty("站点id")
+    private Integer siteId;
+
+    @ApiModelProperty("站点名称")
+    private String siteName;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/UserRoleDto.java

@@ -0,0 +1,39 @@
+package com.zcxk.rmcp.pay.dto;
+
+import com.zcxk.rmcp.pay.entity.Program;
+import com.zcxk.rmcp.pay.entity.User;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class UserRoleDto extends User {
+    private static final long serialVersionUID = -7415302292033826249L;
+
+    @ApiModelProperty(value = "角色id", position = 100)
+    private Integer roleId;
+
+    @ApiModelProperty(value = "角色名称", position = 101)
+    private String roleName;
+
+    @ApiModelProperty(value = "站点名称", position = 102)
+    private String siteName;
+
+    @ApiModelProperty(value = "机构id", position = 103)
+    private Integer organId;
+
+    @ApiModelProperty(value = "机构名称", position = 103)
+    private String organName;
+
+    @ApiModelProperty(value = "机构集合", position = 104)
+    private String organCollections;
+
+    @ApiModelProperty(value = "用户类型 0：无 1:超级管理员 2:站点管理员 3：站点用户", position = 104)
+    private Integer type;
+
+    @ApiModelProperty(value = "数据项集合", position = 105)
+    private List<Program> programList;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/ValidateCode.java

@@ -0,0 +1,23 @@
+package com.zcxk.rmcp.pay.dto;
+
+import lombok.*;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class ValidateCode implements Serializable {
+
+    private static final long serialVersionUID = -1022552011662534880L;
+
+    private String code;
+    private LocalDateTime expireTime;
+
+    public boolean isExpried() {
+        return LocalDateTime.now().isAfter(expireTime);
+    }
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/ZipStreamEntity.java

@@ -0,0 +1,27 @@
+package com.zcxk.rmcp.pay.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.InputStream;
+
+/**
+ * zip相关  流文件实体类
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ZipStreamEntity {
+
+    /**
+     * 文件下载名称
+     */
+    public String name;
+    /**
+     * 文件路径
+     */
+    public String filePath;
+
+    public InputStream inputstream;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/pay/AmountDaySynParamDto.java

@@ -0,0 +1,29 @@
+package com.zcxk.rmcp.pay.dto.pay;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description
+ * @auto wangli
+ * @data 2020-10-09 8:28
+ */
+@Data
+@Api("结算水量同步接口请求参数")
+public class AmountDaySynParamDto implements Serializable {
+
+    private static final long serialVersionUID = 3519394900406918279L;
+
+    @ApiModelProperty("账期，格式yyyymmdd")
+    private String readTime;
+
+    @ApiModelProperty("客户编号")
+    private String customerNo;
+
+    @ApiModelProperty("水表编码")
+    private List<String> fileNo;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/pay/AmountSynParamDto.java

@@ -0,0 +1,29 @@
+package com.zcxk.rmcp.pay.dto.pay;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description
+ * @auto wangli
+ * @data 2020-10-09 8:28
+ */
+@Data
+@Api("结算水量同步接口请求参数")
+public class AmountSynParamDto implements Serializable {
+
+    private static final long serialVersionUID = 3519394900406918279L;
+
+    @ApiModelProperty("账期，格式yyyymm")
+    private String yyyymm;
+
+    @ApiModelProperty("客户编号")
+    private String customerNo;
+
+    @ApiModelProperty("水表编码")
+    private List<String> fileNo;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/pay/AmountSynRespDto.java

@@ -0,0 +1,28 @@
+package com.zcxk.rmcp.pay.dto.pay;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description
+ * @auto wangli
+ * @data 2020-10-09 9:55
+ */
+@Data
+@Api("结算水量同步接口结果")
+public class AmountSynRespDto implements Serializable {
+
+    private static final long serialVersionUID = -4057222618378320320L;
+
+    @ApiModelProperty("结算数据抄表日期")
+    private  String currentPeriodDate;
+    @ApiModelProperty("水表档案号")
+    private  String fileNo;
+    @ApiModelProperty("本期读数")
+    private  String reading;
+    @ApiModelProperty("抄表时间")
+    private  String readTime;
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/pay/AmountWaterUsedAmountDto.java

@@ -0,0 +1,40 @@
+package com.zcxk.rmcp.pay.dto.pay;
+
+import com.zcxk.rmcp.pay.entity.ProgramItem;
+import com.zcxk.rmcp.pay.entity.pay.AmountWaterUsedAmount;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @create 2020-04-28 10:13
+ */
+
+@Data
+@ApiModel
+public class AmountWaterUsedAmountDto extends AmountWaterUsedAmount {
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "安装时间", hidden = true)
+    private Date installdate;
+
+    @ApiModelProperty(value = "账期名称", position = 1)
+    private String closingName;
+
+    @ApiModelProperty(value = "状态 1:待审核 2：已审核 3：待核查 4：核查中", position = 1)
+    private String stateName;
+
+    @ApiModelProperty(value = "结算方式", hidden = true)
+    private Integer calculateway;
+    @ApiModelProperty(value = "固定水量", hidden = true)
+    private Integer fixedamount;
+    //权限项
+    @ApiModelProperty(value = "权限项",  hidden = true)
+    private List<ProgramItem> programItems;
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/pay/BaseClosingAccountDataDto.java

@@ -0,0 +1,23 @@
+package com.zcxk.rmcp.pay.dto.pay;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @create 2020-04-28 14:43
+ */
+
+
+@Data
+@ApiModel
+public class BaseClosingAccountDataDto {
+    @ApiModelProperty(value = "账期名称", position = 1)
+    private String name;
+    @ApiModelProperty(value = "账期年", position = 1)
+    private Integer year;
+    @ApiModelProperty(value = "账期月", position = 1)
+    private Integer month;
+
+}

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/pay/BaseClosingAccountInfoDto.java

@@ -0,0 +1,23 @@
+package com.zcxk.rmcp.pay.dto.pay;
+
+import com.zcxk.rmcp.pay.entity.pay.BaseClosingAccountInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @create 2020-04-24 8:15
+ */
+@Data
+@ApiModel
+public class BaseClosingAccountInfoDto extends BaseClosingAccountInfo {
+
+
+    @ApiModelProperty(value = "结算方式 1:月结 2:年结", position = 1)
+    private String closingTypeName;
+
+    @ApiModelProperty(value = "状态 0：未结账 1：已结账", position = 1)
+    private String stateName;
+
+}