Browse Source

Merge remote-tracking branch 'origin/master'

by su 3 years ago
parent
commit
5d0366d2c8
100 changed files with 5453 additions and 0 deletions
  1. 23 0
      4dkankan-center-agent/pom.xml
  2. 23 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/AgentApplication.java
  3. 121 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/entity/Agent.java
  4. 169 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/entity/AgentAudit.java
  5. 64 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/entity/AgentFramework.java
  6. 65 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/entity/AgentNotice.java
  7. 9 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/mapper/IAgentAuditMapper.java
  8. 8 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/mapper/IAgentFrameworkMapper.java
  9. 9 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/mapper/IAgentMapper.java
  10. 8 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/mapper/IAgentNoticeMapper.java
  11. 9 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/IAgentAuditService.java
  12. 9 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/IAgentFrameworkService.java
  13. 9 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/IAgentNoticeService.java
  14. 9 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/IAgentService.java
  15. 30 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/impl/AgentAuditService.java
  16. 30 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/impl/AgentFrameworkService.java
  17. 30 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/impl/AgentNoticeService.java
  18. 30 0
      4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/impl/AgentService.java
  19. 39 0
      4dkankan-center-agent/src/main/resources/application.yml
  20. 230 0
      4dkankan-center-agent/src/main/resources/logback-spring.xml
  21. 128 0
      4dkankan-center-agent/src/main/resources/mapper/agent/AgentAuditMapper.xml
  22. 116 0
      4dkankan-center-agent/src/main/resources/mapper/agent/AgentFrameworkMapper.xml
  23. 122 0
      4dkankan-center-agent/src/main/resources/mapper/agent/AgentMapper.xml
  24. 115 0
      4dkankan-center-agent/src/main/resources/mapper/agent/AgentNoticeMapper.xml
  25. 23 0
      4dkankan-center-goods/pom.xml
  26. 23 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/GoodsApplication.java
  27. 97 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/Camera.java
  28. 169 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/CameraDetail.java
  29. 81 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/CameraOut.java
  30. 105 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/CameraSpace.java
  31. 113 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/CameraVersion.java
  32. 106 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/Cart.java
  33. 138 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/CommerceOrder.java
  34. 113 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/Company.java
  35. 146 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/DownloadOrder.java
  36. 170 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/ExpansionOrder.java
  37. 130 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/Goods.java
  38. 122 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/GoodsSku.java
  39. 56 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/GoodsSpec.java
  40. 65 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/GoodsSpecValue.java
  41. 65 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/GoodsSpuSpec.java
  42. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICameraDetailMapper.java
  43. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICameraMapper.java
  44. 7 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICameraOutMapper.java
  45. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICameraSpaceMapper.java
  46. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICameraVersionMapper.java
  47. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICartMapper.java
  48. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICommerceOrderMapper.java
  49. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICompanyMapper.java
  50. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IDownloadOrderMapper.java
  51. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IExpansionOrderMapper.java
  52. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IGoodsMapper.java
  53. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IGoodsSkuMapper.java
  54. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IGoodsSpecMapper.java
  55. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IGoodsSpecValueMapper.java
  56. 8 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IGoodsSpuSpecMapper.java
  57. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICameraDetailService.java
  58. 10 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICameraOutService.java
  59. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICameraService.java
  60. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICameraSpaceService.java
  61. 10 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICameraVersionService.java
  62. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICartService.java
  63. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICommerceOrderService.java
  64. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICompanyService.java
  65. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IDownloadOrderService.java
  66. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IExpansionOrderService.java
  67. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IGoodsService.java
  68. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IGoodsSkuService.java
  69. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IGoodsSpecService.java
  70. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IGoodsSpecValueService.java
  71. 9 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IGoodsSpuSpecService.java
  72. 31 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CameraDetailService.java
  73. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CameraOutService.java
  74. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CameraService.java
  75. 31 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CameraSpaceService.java
  76. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CameraVersionService.java
  77. 31 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CartService.java
  78. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CommerceOrderService.java
  79. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CompanyService.java
  80. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/DownloadOrderService.java
  81. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/ExpansionOrderService.java
  82. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/GoodsService.java
  83. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/GoodsSkuService.java
  84. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/GoodsSpecService.java
  85. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/GoodsSpecValueService.java
  86. 30 0
      4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/GoodsSpuSpecService.java
  87. 39 0
      4dkankan-center-goods/src/main/resources/application.yml
  88. 230 0
      4dkankan-center-goods/src/main/resources/logback-spring.xml
  89. 128 0
      4dkankan-center-goods/src/main/resources/mapper/goods/CameraDetailMapper.xml
  90. 119 0
      4dkankan-center-goods/src/main/resources/mapper/goods/CameraMapper.xml
  91. 117 0
      4dkankan-center-goods/src/main/resources/mapper/goods/CameraOutMapper.xml
  92. 120 0
      4dkankan-center-goods/src/main/resources/mapper/goods/CameraSpaceMapper.xml
  93. 121 0
      4dkankan-center-goods/src/main/resources/mapper/goods/CameraVersionMapper.xml
  94. 120 0
      4dkankan-center-goods/src/main/resources/mapper/goods/CartMapper.xml
  95. 124 0
      4dkankan-center-goods/src/main/resources/mapper/goods/CommerceOrderMapper.xml
  96. 121 0
      4dkankan-center-goods/src/main/resources/mapper/goods/CompanyMapper.xml
  97. 125 0
      4dkankan-center-goods/src/main/resources/mapper/goods/DownloadOrderMapper.xml
  98. 128 0
      4dkankan-center-goods/src/main/resources/mapper/goods/ExpansionOrderMapper.xml
  99. 123 0
      4dkankan-center-goods/src/main/resources/mapper/goods/GoodsMapper.xml
  100. 0 0
      4dkankan-center-goods/src/main/resources/mapper/goods/GoodsSkuMapper.xml

+ 23 - 0
4dkankan-center-agent/pom.xml

@@ -0,0 +1,23 @@
+<?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>4dkankan-parent</artifactId>
+        <groupId>com.fdkankan</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>4dkankan-agent</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-common</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+</project>

+ 23 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/AgentApplication.java

@@ -0,0 +1,23 @@
+package com.fdkankan.agent;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients //扫描包
+@MapperScan("com.fdkankan.**.mapper")
+public class AgentApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(AgentApplication.class, args);
+	}
+}
+
+
+
+

+ 121 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/entity/Agent.java

@@ -0,0 +1,121 @@
+package com.fdkankan.agent.entity;
+
+
+public class Agent implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String agentId; // 代理商Id
+	private String agentName; // 代理商公司名称
+	private String agentPassword; // 代理商密码
+	private String agentArea; // 代理商区域
+	private String agentEmail; // 代理商邮箱
+	private String agentPhone; // 代理商电话
+	private Integer state; // 状态:1-正常,0-冻结
+	private Integer agentNum; // 代理数量
+	private String agentCountry; // 代理商所在的国家
+	private String createTime; // 创建时间
+	private String updateTime; // 更新时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private Integer tbStatus; // 0正常 ,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getAgentId() {
+		return agentId;
+	}
+	public void setAgentId(String agentId) {
+		this.agentId = agentId;
+	}
+
+	public String getAgentName() {
+		return agentName;
+	}
+	public void setAgentName(String agentName) {
+		this.agentName = agentName;
+	}
+
+	public String getAgentPassword() {
+		return agentPassword;
+	}
+	public void setAgentPassword(String agentPassword) {
+		this.agentPassword = agentPassword;
+	}
+
+	public String getAgentArea() {
+		return agentArea;
+	}
+	public void setAgentArea(String agentArea) {
+		this.agentArea = agentArea;
+	}
+
+	public String getAgentEmail() {
+		return agentEmail;
+	}
+	public void setAgentEmail(String agentEmail) {
+		this.agentEmail = agentEmail;
+	}
+
+	public String getAgentPhone() {
+		return agentPhone;
+	}
+	public void setAgentPhone(String agentPhone) {
+		this.agentPhone = agentPhone;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public Integer getAgentNum() {
+		return agentNum;
+	}
+	public void setAgentNum(Integer agentNum) {
+		this.agentNum = agentNum;
+	}
+
+	public String getAgentCountry() {
+		return agentCountry;
+	}
+	public void setAgentCountry(String agentCountry) {
+		this.agentCountry = agentCountry;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 169 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/entity/AgentAudit.java

@@ -0,0 +1,169 @@
+package com.fdkankan.agent.entity;
+
+
+public class AgentAudit implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String auditName; // 经销商公司名称
+	private String country; // 国家
+	private String region; // 地区
+	private String address; // 地址
+	private Integer auditType; // 类型,1为线下,2为线上
+	private String storeAddress; // 线下门店地址或线上网站
+	private String surName; // 申请人的姓
+	private String userName; // 申请人的名字
+	private String post; // 申请人职位
+	private String areaCode; // 区号
+	private String phone; // 手机号
+	private String email; // 邮箱地址
+	private Integer state; // 状态,0申请中,1审核通过,2审核失败
+	private String createTime; // 创建时间
+	private String updateTime; // 更新时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private Integer noteType; // 备注等级
+	private String noteContent; // 备注内容
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getAuditName() {
+		return auditName;
+	}
+	public void setAuditName(String auditName) {
+		this.auditName = auditName;
+	}
+
+	public String getCountry() {
+		return country;
+	}
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public String getRegion() {
+		return region;
+	}
+	public void setRegion(String region) {
+		this.region = region;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public Integer getAuditType() {
+		return auditType;
+	}
+	public void setAuditType(Integer auditType) {
+		this.auditType = auditType;
+	}
+
+	public String getStoreAddress() {
+		return storeAddress;
+	}
+	public void setStoreAddress(String storeAddress) {
+		this.storeAddress = storeAddress;
+	}
+
+	public String getSurName() {
+		return surName;
+	}
+	public void setSurName(String surName) {
+		this.surName = surName;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getPost() {
+		return post;
+	}
+	public void setPost(String post) {
+		this.post = post;
+	}
+
+	public String getAreaCode() {
+		return areaCode;
+	}
+	public void setAreaCode(String areaCode) {
+		this.areaCode = areaCode;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public Integer getNoteType() {
+		return noteType;
+	}
+	public void setNoteType(Integer noteType) {
+		this.noteType = noteType;
+	}
+
+	public String getNoteContent() {
+		return noteContent;
+	}
+	public void setNoteContent(String noteContent) {
+		this.noteContent = noteContent;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 64 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/entity/AgentFramework.java

@@ -0,0 +1,64 @@
+package com.fdkankan.agent.entity;
+
+public class AgentFramework implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String parentId; // 上级架构id
+	private String agentName; // 代理商名称
+	private String recStatus; // 
+	private String createTime; // 
+	private String updateTime; // 
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getParentId() {
+		return parentId;
+	}
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
+
+	public String getAgentName() {
+		return agentName;
+	}
+	public void setAgentName(String agentName) {
+		this.agentName = agentName;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 65 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/entity/AgentNotice.java

@@ -0,0 +1,65 @@
+package com.fdkankan.agent.entity;
+
+
+public class AgentNotice implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String title; // 标题
+	private String content; // 公告内容
+	private String createTime; // 创建时间
+	private String updateTime; // 更新时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getContent() {
+		return content;
+	}
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 9 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/mapper/IAgentAuditMapper.java

@@ -0,0 +1,9 @@
+package com.fdkankan.agent.mapper;
+
+
+import com.fdkankan.agent.entity.AgentAudit;
+import com.fdkankan.common.base.IOperations;
+
+public interface IAgentAuditMapper extends IOperations<AgentAudit> {
+}
+

+ 8 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/mapper/IAgentFrameworkMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.agent.mapper;
+
+import com.fdkankan.agent.entity.AgentFramework;
+import com.fdkankan.common.base.IOperations;
+
+public interface IAgentFrameworkMapper extends IOperations<AgentFramework> {
+}
+

+ 9 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/mapper/IAgentMapper.java

@@ -0,0 +1,9 @@
+package com.fdkankan.agent.mapper;
+
+
+import com.fdkankan.agent.entity.Agent;
+import com.fdkankan.common.base.IOperations;
+
+public interface IAgentMapper extends IOperations<Agent> {
+}
+

+ 8 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/mapper/IAgentNoticeMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.agent.mapper;
+
+import com.fdkankan.agent.entity.AgentNotice;
+import com.fdkankan.common.base.IOperations;
+
+public interface IAgentNoticeMapper extends IOperations<AgentNotice> {
+}
+

+ 9 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/IAgentAuditService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.agent.service;
+
+import com.fdkankan.agent.entity.AgentAudit;
+import com.fdkankan.common.base.IServiceOperations;
+
+public interface IAgentAuditService extends IServiceOperations<AgentAudit> {
+
+}
+

+ 9 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/IAgentFrameworkService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.agent.service;
+
+import com.fdkankan.agent.entity.AgentFramework;
+import com.fdkankan.common.base.IServiceOperations;
+
+public interface IAgentFrameworkService extends IServiceOperations<AgentFramework> {
+
+}
+

+ 9 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/IAgentNoticeService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.agent.service;
+
+import com.fdkankan.agent.entity.AgentNotice;
+import com.fdkankan.common.base.IServiceOperations;
+
+public interface IAgentNoticeService extends IServiceOperations<AgentNotice> {
+
+}
+

+ 9 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/IAgentService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.agent.service;
+
+import com.fdkankan.agent.entity.Agent;
+import com.fdkankan.common.base.IServiceOperations;
+
+public interface IAgentService extends IServiceOperations<Agent> {
+
+}
+

+ 30 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/impl/AgentAuditService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.agent.service.impl;
+
+import com.fdkankan.agent.entity.AgentAudit;
+import com.fdkankan.agent.mapper.IAgentAuditMapper;
+import com.fdkankan.agent.service.IAgentAuditService;
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("AgentAuditService")
+public class AgentAuditService extends AbstractService<AgentAudit> implements IAgentAuditService {
+
+	public AgentAuditService() {
+		this.setTableName("t_agent_audit");
+	}
+	@Resource
+	private IAgentAuditMapper tAgentAuditMapper;
+
+	@Override
+	protected IOperations<AgentAudit> getMapper() {
+		return tAgentAuditMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/impl/AgentFrameworkService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.agent.service.impl;
+
+import com.fdkankan.agent.entity.AgentFramework;
+import com.fdkankan.agent.mapper.IAgentFrameworkMapper;
+import com.fdkankan.agent.service.IAgentFrameworkService;
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("AgentFrameworkService")
+public class AgentFrameworkService extends AbstractService<AgentFramework> implements IAgentFrameworkService {
+
+	public AgentFrameworkService() {
+		this.setTableName("t_agent_framework");
+	}
+	@Resource
+	private IAgentFrameworkMapper tAgentFrameworkMapper;
+
+	@Override
+	protected IOperations<AgentFramework> getMapper() {
+		return tAgentFrameworkMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/impl/AgentNoticeService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.agent.service.impl;
+
+import com.fdkankan.agent.entity.AgentNotice;
+import com.fdkankan.agent.mapper.IAgentNoticeMapper;
+import com.fdkankan.agent.service.IAgentNoticeService;
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("AgentNoticeService")
+public class AgentNoticeService extends AbstractService<AgentNotice> implements IAgentNoticeService {
+
+	public AgentNoticeService() {
+		this.setTableName("t_agent_notice");
+	}
+	@Resource
+	private IAgentNoticeMapper tAgentNoticeMapper;
+
+	@Override
+	protected IOperations<AgentNotice> getMapper() {
+		return tAgentNoticeMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-agent/src/main/java/com/fdkankan/agent/service/impl/AgentService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.agent.service.impl;
+
+import com.fdkankan.agent.entity.Agent;
+import com.fdkankan.agent.mapper.IAgentMapper;
+import com.fdkankan.agent.service.IAgentService;
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("AgentService")
+public class AgentService extends AbstractService<Agent> implements IAgentService {
+
+	public AgentService() {
+		this.setTableName("t_agent");
+	}
+	@Resource
+	private IAgentMapper tAgentMapper;
+
+	@Override
+	protected IOperations<Agent> getMapper() {
+		return tAgentMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 39 - 0
4dkankan-center-agent/src/main/resources/application.yml

@@ -0,0 +1,39 @@
+server:
+  port: 8081
+  servlet:
+    context-path: /agent
+  tomcat:
+    accesslog:
+      buffered: true
+      directory: /home/logs/tomcat
+      enabled: true
+      file-date-format: .yyyy-MM-dd
+      pattern: '%t | %{X-Real-IP}i | %b | %B | %H | %l | %m | %p | %q | %r | %s | %S | %u | %U | %v | %D | %T | %{Cookie}i | %{User-Agent}i | %{a}r'
+      prefix: access_log
+      rename-on-rotate: false
+      request-attributes-enabled: false
+      rotate: true
+      suffix: .log
+spring:
+  cloud:
+    nacos:
+      discovery:
+        port: ${discoveryPort:8848}
+        server-addr: 127.0.0.1
+  application:
+    name: agent
+  datasource:
+    name: test
+    url: jdbc:mysql://localhost:3306/4dkankan_center_application?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC&allowMultiQueries=true
+    username: root
+    password: 123456
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+mybatis:
+  mapper-locations: classpath:mapper/*/*.xml
+  type-aliases-package: com.4dkankan_center_application.www
+  configuration:
+    map-underscore-to-camel-case: true
+logging:
+  config: classpath:logback-spring.xml
+

+ 230 - 0
4dkankan-center-agent/src/main/resources/logback-spring.xml

@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL,如果设置为WARN,则低于WARN的信息都不会输出 -->
+<!-- scan:当此属性设置为true时,配置文件如果发生改变,将会被重新加载,默认值为true -->
+<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔,如果没有给出时间单位,默认单位是毫秒。当scan为true时,此属性生效。默认的时间间隔为1分钟。 -->
+<!-- debug:当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。 -->
+<configuration scan="true" scanPeriod="10 seconds">
+
+	<contextName>logback</contextName>
+	<!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
+	<property name="log.path" value="/home/logs/4dkankan_center_application" />
+
+	<!-- 彩色日志 -->
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN"
+		value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+
+	<!--输出到控制台 -->
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<!--此日志appender是为开发使用,只配置最底级别,控制台输出的日志级别是大于或等于此级别的日志信息 -->
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>info</level>
+		</filter>
+		<encoder>
+			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+			<!-- 设置字符集 -->
+			<charset>UTF-8</charset>
+		</encoder>
+	</appender>
+	<!--输出到文件 -->
+
+	<!-- 时间滚动输出 level为 DEBUG 日志 -->
+	<appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/log_debug.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset> <!-- 设置字符集 -->
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<!-- 日志归档 -->
+			<fileNamePattern>${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录debug级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<level>debug</level>
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+
+	<!-- 时间滚动输出 level为 INFO 日志 -->
+	<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/log_info.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset>
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<!-- 每天日志归档路径以及格式 -->
+			<fileNamePattern>${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录info级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<level>info</level>
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+
+	<!-- 时间滚动输出 level为 WARN 日志 -->
+	<appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/log_warn.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录warn级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<level>warn</level>
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+
+
+	<!-- 时间滚动输出 level为 ERROR 日志 -->
+	<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/log_error.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录ERROR级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<level>ERROR</level>
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+	
+	<appender name="PROGRAM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/program/log_program.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/program/log-program-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录ERROR级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+	<logger name="programLog" level="INFO" additivity="true">
+        <appender-ref ref="PROGRAM_FILE"/>
+    </logger>
+
+	<appender name="VISIT_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/visit/log_visit.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/visit/log-visit-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录ERROR级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+	<logger name="visitLog" level="INFO" additivity="true">
+        <appender-ref ref="VISIT_FILE"/>
+    </logger>
+
+	<!-- <logger>用来设置某一个包或者具体的某一个类的日志打印级别、 以及指定<appender>。<logger>仅有一个name属性, 一个可选的level和一个可选的addtivity属性。 name:用来指定受此logger约束的某一个包或者具体的某一个类。 level:用来设置打印级别,大小写无关:TRACE, 
+		DEBUG, INFO, WARN, ERROR, ALL 和 OFF, 还有一个特俗值INHERITED或者同义词NULL,代表强制执行上级的级别。 如果未设置此属性,那么当前logger将会继承上级的级别。 addtivity:是否向上级logger传递打印信息。默认是true。 -->
+	<!--<logger name="org.springframework.web" level="info"/> -->
+	<!--<logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/> -->
+	<!-- 使用mybatis的时候,sql语句是debug下才会打印,而这里我们只配置了info,所以想要查看sql语句的话,有以下两种操作: 第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql,不过这样日志那边会出现很多其他消息 第二种就是单独给dao下目录配置debug模式,代码如下,这样配置sql语句会打印,其他还是正常info级别: -->
+	<!-- root节点是必选节点,用来指定最基础的日志输出级别,只有一个level属性 level:用来设置打印级别,大小写无关:TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF, 不能设置为INHERITED或者同义词NULL。默认是DEBUG 可以包含零个或多个元素,标识这个appender将会添加到这个logger。 -->
+
+	<root level="info">
+		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="DEBUG_FILE" />
+		<appender-ref ref="INFO_FILE" />
+		<appender-ref ref="WARN_FILE" />
+		<appender-ref ref="ERROR_FILE" />
+	</root>
+
+	<!--生产环境:输出到文件 -->
+	<!--<springProfile name="pro"> -->
+	<!--<root level="info"> -->
+	<!--<appender-ref ref="CONSOLE" /> -->
+	<!--<appender-ref ref="DEBUG_FILE" /> -->
+	<!--<appender-ref ref="INFO_FILE" /> -->
+	<!--<appender-ref ref="ERROR_FILE" /> -->
+	<!--<appender-ref ref="WARN_FILE" /> -->
+	<!--</root> -->
+	<!--</springProfile> -->
+
+</configuration>
+
+

+ 128 - 0
4dkankan-center-agent/src/main/resources/mapper/agent/AgentAuditMapper.xml

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.agent.mapper.IAgentAuditMapper">
+	<resultMap id="resultMap" type="com.fdkankan.agent.entity.AgentAudit">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="audit_name" jdbcType="VARCHAR" property="auditName" />
+		<result column="country" jdbcType="VARCHAR" property="country" />
+		<result column="region" jdbcType="VARCHAR" property="region" />
+		<result column="address" jdbcType="VARCHAR" property="address" />
+		<result column="audit_type" jdbcType="INTEGER" property="auditType" />
+		<result column="store_address" jdbcType="VARCHAR" property="storeAddress" />
+		<result column="sur_name" jdbcType="VARCHAR" property="surName" />
+		<result column="user_name" jdbcType="VARCHAR" property="userName" />
+		<result column="post" jdbcType="VARCHAR" property="post" />
+		<result column="area_code" jdbcType="VARCHAR" property="areaCode" />
+		<result column="phone" jdbcType="VARCHAR" property="phone" />
+		<result column="email" jdbcType="VARCHAR" property="email" />
+		<result column="state" jdbcType="INTEGER" property="state" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="note_type" jdbcType="INTEGER" property="noteType" />
+		<result column="note_content" jdbcType="VARCHAR" property="noteContent" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,audit_name,country,region,address,audit_type,store_address,sur_name,user_name,post,area_code,phone,email,state,create_time,update_time,rec_status,note_type,note_content,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		audit_name, country, region, address, audit_type, store_address, sur_name, user_name, post, area_code, phone, email, state, rec_status, note_type, note_content
+		) VALUES (
+		#{entity.auditName}, #{entity.country}, #{entity.region}, #{entity.address}, #{entity.auditType}, #{entity.storeAddress}, #{entity.surName}, #{entity.userName}, #{entity.post}, #{entity.areaCode}, #{entity.phone}, #{entity.email}, #{entity.state}, #{entity.recStatus}, #{entity.noteType}, #{entity.noteContent}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		audit_name, country, region, address, audit_type, store_address, sur_name, user_name, post, area_code, phone, email, state, rec_status, note_type, note_content
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.auditName}, #{entity.country}, #{entity.region}, #{entity.address}, #{entity.auditType}, #{entity.storeAddress}, #{entity.surName}, #{entity.userName}, #{entity.post}, #{entity.areaCode}, #{entity.phone}, #{entity.email}, #{entity.state}, #{entity.recStatus}, #{entity.noteType}, #{entity.noteContent})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		audit_name=#{entity.auditName}, country=#{entity.country}, region=#{entity.region}, address=#{entity.address}, audit_type=#{entity.auditType}, store_address=#{entity.storeAddress}, sur_name=#{entity.surName}, user_name=#{entity.userName}, post=#{entity.post}, area_code=#{entity.areaCode}, phone=#{entity.phone}, email=#{entity.email}, state=#{entity.state}, rec_status=#{entity.recStatus}, note_type=#{entity.noteType}, note_content=#{entity.noteContent}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 116 - 0
4dkankan-center-agent/src/main/resources/mapper/agent/AgentFrameworkMapper.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+<mapper namespace="com.fdkankan.agent.mapper.IAgentFrameworkMapper">
+	<resultMap id="resultMap" type="com.fdkankan.agent.entity.AgentFramework">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="parent_id" jdbcType="VARCHAR" property="parentId" />
+		<result column="agent_name" jdbcType="VARCHAR" property="agentName" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,parent_id,agent_name,rec_status,create_time,update_time,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		parent_id, agent_name, rec_status
+		) VALUES (
+		#{entity.parentId}, #{entity.agentName}, #{entity.recStatus}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		parent_id, agent_name, rec_status
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.parentId}, #{entity.agentName}, #{entity.recStatus})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		parent_id=#{entity.parentId}, agent_name=#{entity.agentName}, rec_status=#{entity.recStatus}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 122 - 0
4dkankan-center-agent/src/main/resources/mapper/agent/AgentMapper.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.agent.mapper.IAgentMapper">
+	<resultMap id="resultMap" type="com.fdkankan.agent.entity.Agent">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="agent_id" jdbcType="VARCHAR" property="agentId" />
+		<result column="agent_name" jdbcType="VARCHAR" property="agentName" />
+		<result column="agent_password" jdbcType="VARCHAR" property="agentPassword" />
+		<result column="agent_area" jdbcType="VARCHAR" property="agentArea" />
+		<result column="agent_email" jdbcType="VARCHAR" property="agentEmail" />
+		<result column="agent_phone" jdbcType="VARCHAR" property="agentPhone" />
+		<result column="state" jdbcType="INTEGER" property="state" />
+		<result column="agent_num" jdbcType="INTEGER" property="agentNum" />
+		<result column="agent_country" jdbcType="VARCHAR" property="agentCountry" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,agent_id,agent_name,agent_password,agent_area,agent_email,agent_phone,state,agent_num,agent_country,create_time,update_time,rec_status,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		agent_id, agent_name, agent_password, agent_area, agent_email, agent_phone, state, agent_num, agent_country, rec_status
+		) VALUES (
+		#{entity.agentId}, #{entity.agentName}, #{entity.agentPassword}, #{entity.agentArea}, #{entity.agentEmail}, #{entity.agentPhone}, #{entity.state}, #{entity.agentNum}, #{entity.agentCountry}, #{entity.recStatus}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		agent_id, agent_name, agent_password, agent_area, agent_email, agent_phone, state, agent_num, agent_country, rec_status
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.agentId}, #{entity.agentName}, #{entity.agentPassword}, #{entity.agentArea}, #{entity.agentEmail}, #{entity.agentPhone}, #{entity.state}, #{entity.agentNum}, #{entity.agentCountry}, #{entity.recStatus})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		agent_id=#{entity.agentId}, agent_name=#{entity.agentName}, agent_password=#{entity.agentPassword}, agent_area=#{entity.agentArea}, agent_email=#{entity.agentEmail}, agent_phone=#{entity.agentPhone}, state=#{entity.state}, agent_num=#{entity.agentNum}, agent_country=#{entity.agentCountry}, rec_status=#{entity.recStatus}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 115 - 0
4dkankan-center-agent/src/main/resources/mapper/agent/AgentNoticeMapper.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.agent.mapper.IAgentNoticeMapper">
+	<resultMap id="resultMap" type="com.fdkankan.agent.entity.AgentNotice">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="title" jdbcType="VARCHAR" property="title" />
+		<result column="content" jdbcType="VARCHAR" property="content" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,title,content,create_time,update_time,rec_status,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		title, content, rec_status
+		) VALUES (
+		#{entity.title}, #{entity.content}, #{entity.recStatus}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		title, content, rec_status
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.title}, #{entity.content}, #{entity.recStatus})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		title=#{entity.title}, content=#{entity.content}, rec_status=#{entity.recStatus}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 23 - 0
4dkankan-center-goods/pom.xml

@@ -0,0 +1,23 @@
+<?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>4dkankan-parent</artifactId>
+        <groupId>com.fdkankan</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>4dkankan-goods</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-common</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+
+</project>

+ 23 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/GoodsApplication.java

@@ -0,0 +1,23 @@
+package com.fdkankan.goods;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients //扫描包
+@MapperScan("com.fdkankan.**.mapper")
+public class GoodsApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(GoodsApplication.class, args);
+	}
+}
+
+
+
+

+ 97 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/Camera.java

@@ -0,0 +1,97 @@
+package com.fdkankan.goods.entity;
+
+
+public class Camera implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String childName; // 相机的Mac地址
+	private String activatedTime; // 激活时间
+	private String childPassword; // 相机密码
+	private String snCode; // sn码
+	private String wifiName; // wifi名称
+	private String wifiPassword; // wifi密码
+	private String createTime; // 创建时间
+	private String updateTime; // 更新时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getChildName() {
+		return childName;
+	}
+	public void setChildName(String childName) {
+		this.childName = childName;
+	}
+
+	public String getActivatedTime() {
+		return activatedTime;
+	}
+	public void setActivatedTime(String activatedTime) {
+		this.activatedTime = activatedTime;
+	}
+
+	public String getChildPassword() {
+		return childPassword;
+	}
+	public void setChildPassword(String childPassword) {
+		this.childPassword = childPassword;
+	}
+
+	public String getSnCode() {
+		return snCode;
+	}
+	public void setSnCode(String snCode) {
+		this.snCode = snCode;
+	}
+
+	public String getWifiName() {
+		return wifiName;
+	}
+	public void setWifiName(String wifiName) {
+		this.wifiName = wifiName;
+	}
+
+	public String getWifiPassword() {
+		return wifiPassword;
+	}
+	public void setWifiPassword(String wifiPassword) {
+		this.wifiPassword = wifiPassword;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 169 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/CameraDetail.java

@@ -0,0 +1,169 @@
+package com.fdkankan.goods.entity;
+
+
+public class CameraDetail implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String balance; // 余额
+	private String userId; // 用户表t_user的id
+	private Integer own; // 0表示客户,1表示员工,2表示赠送,3表示其他,4经销商销售
+	private String orderSn; // 订单号
+	private Integer country; // 0表示本国,1表示国外
+	private String agency; // 经销商
+	private Integer cameraType; // 相机类型,0表示双目,1四维看看pro,2 四维看看lite,9 双目转台,10 激光转台
+	private String totalSpace; // 总容量
+	private String usedSpace; // 已使用容量
+	private String cameraId; // 相机主表t_camera的id
+	private String goodsId; // 商品表t_goods的id
+	private String companyId; // 企业表t_company的id
+	private String agentFrameworkId; // 代理商架构管理t_agent_framework的id
+	private String cooperationUser; // 相机协作用户id
+	private String address; // 设备地址(追溯管理后台)
+	private String createTime; // 创建时间
+	private String updateTime; // 更新时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getBalance() {
+		return balance;
+	}
+	public void setBalance(String balance) {
+		this.balance = balance;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public Integer getOwn() {
+		return own;
+	}
+	public void setOwn(Integer own) {
+		this.own = own;
+	}
+
+	public String getOrderSn() {
+		return orderSn;
+	}
+	public void setOrderSn(String orderSn) {
+		this.orderSn = orderSn;
+	}
+
+	public Integer getCountry() {
+		return country;
+	}
+	public void setCountry(Integer country) {
+		this.country = country;
+	}
+
+	public String getAgency() {
+		return agency;
+	}
+	public void setAgency(String agency) {
+		this.agency = agency;
+	}
+
+	public Integer getCameraType() {
+		return cameraType;
+	}
+	public void setCameraType(Integer cameraType) {
+		this.cameraType = cameraType;
+	}
+
+	public String getTotalSpace() {
+		return totalSpace;
+	}
+	public void setTotalSpace(String totalSpace) {
+		this.totalSpace = totalSpace;
+	}
+
+	public String getUsedSpace() {
+		return usedSpace;
+	}
+	public void setUsedSpace(String usedSpace) {
+		this.usedSpace = usedSpace;
+	}
+
+	public String getCameraId() {
+		return cameraId;
+	}
+	public void setCameraId(String cameraId) {
+		this.cameraId = cameraId;
+	}
+
+	public String getGoodsId() {
+		return goodsId;
+	}
+	public void setGoodsId(String goodsId) {
+		this.goodsId = goodsId;
+	}
+
+	public String getCompanyId() {
+		return companyId;
+	}
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getAgentFrameworkId() {
+		return agentFrameworkId;
+	}
+	public void setAgentFrameworkId(String agentFrameworkId) {
+		this.agentFrameworkId = agentFrameworkId;
+	}
+
+	public String getCooperationUser() {
+		return cooperationUser;
+	}
+	public void setCooperationUser(String cooperationUser) {
+		this.cooperationUser = cooperationUser;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 81 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/CameraOut.java

@@ -0,0 +1,81 @@
+package com.fdkankan.goods.entity;
+
+
+public class CameraOut implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String cameraId; // 相机id
+	private String orderId; // 订单id
+	private String agentName; // 经销商
+	private Integer outType; // 0:测试使用,1:线上出库,2:经销商出库
+	private String createTime; // 
+	private String updateTime; // 
+	private String recStatus; // 
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getCameraId() {
+		return cameraId;
+	}
+	public void setCameraId(String cameraId) {
+		this.cameraId = cameraId;
+	}
+
+	public String getOrderId() {
+		return orderId;
+	}
+	public void setOrderId(String orderId) {
+		this.orderId = orderId;
+	}
+
+	public String getAgentName() {
+		return agentName;
+	}
+	public void setAgentName(String agentName) {
+		this.agentName = agentName;
+	}
+
+	public Integer getOutType() {
+		return outType;
+	}
+	public void setOutType(Integer outType) {
+		this.outType = outType;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 105 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/CameraSpace.java

@@ -0,0 +1,105 @@
+package com.fdkankan.goods.entity;
+
+
+public class CameraSpace implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String userId; // 用户表t_user的id
+	private String cameraId; // 相机主表t_camera的id
+	private String space; // 容量
+	private Integer spaceType; // 容量类型,0表示基础容量,1表示期限容量,2表示扩容容量
+	private String spaceStartTime; // 生效时间
+	private String spaceEndTime; // 结束时间
+	private String createTime; // 创建时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private String updateTime; // 更新时间
+	private String orderSn; // 扩容订单集合
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getCameraId() {
+		return cameraId;
+	}
+	public void setCameraId(String cameraId) {
+		this.cameraId = cameraId;
+	}
+
+	public String getSpace() {
+		return space;
+	}
+	public void setSpace(String space) {
+		this.space = space;
+	}
+
+	public Integer getSpaceType() {
+		return spaceType;
+	}
+	public void setSpaceType(Integer spaceType) {
+		this.spaceType = spaceType;
+	}
+
+	public String getSpaceStartTime() {
+		return spaceStartTime;
+	}
+	public void setSpaceStartTime(String spaceStartTime) {
+		this.spaceStartTime = spaceStartTime;
+	}
+
+	public String getSpaceEndTime() {
+		return spaceEndTime;
+	}
+	public void setSpaceEndTime(String spaceEndTime) {
+		this.spaceEndTime = spaceEndTime;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getOrderSn() {
+		return orderSn;
+	}
+	public void setOrderSn(String orderSn) {
+		this.orderSn = orderSn;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 113 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/CameraVersion.java

@@ -0,0 +1,113 @@
+package com.fdkankan.goods.entity;
+
+
+public class CameraVersion implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private Integer id; // 
+	private String fileName; // 名称
+	private String fileUrl; // 文件rul
+	private String fileMd5; // 文件MD5
+	private String description; // 描述
+	private String version; // 相机版本
+	private Integer cameraType; // 相机类型,1八目,2双目, 3转台双目, 4激光转台
+	private String acStatus; // 活动状态:A: 生效,I: 禁用
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private String createTime; // 创建日期
+	private String updateTime; // 修改日期
+	private String minVersion; // 相机版本(最小)
+	private Integer tbStatus; // 0正常,1删除
+
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+
+	public String getFileUrl() {
+		return fileUrl;
+	}
+	public void setFileUrl(String fileUrl) {
+		this.fileUrl = fileUrl;
+	}
+
+	public String getFileMd5() {
+		return fileMd5;
+	}
+	public void setFileMd5(String fileMd5) {
+		this.fileMd5 = fileMd5;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public Integer getCameraType() {
+		return cameraType;
+	}
+	public void setCameraType(Integer cameraType) {
+		this.cameraType = cameraType;
+	}
+
+	public String getAcStatus() {
+		return acStatus;
+	}
+	public void setAcStatus(String acStatus) {
+		this.acStatus = acStatus;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getMinVersion() {
+		return minVersion;
+	}
+	public void setMinVersion(String minVersion) {
+		this.minVersion = minVersion;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 106 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/Cart.java

@@ -0,0 +1,106 @@
+package com.fdkankan.goods.entity;
+import java.math.BigDecimal;
+
+
+public class Cart implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String userId; // t_user的id
+	private String goodsId; // t_goods的id
+	private String skuSn; // sku编号,唯一
+	private Integer goodsCount; // 商品数量
+	private BigDecimal price; // 价格
+	private BigDecimal amount; // 合计
+	private Integer payStatus; // 0表示未付,1表示已付
+	private String createTime; // 创建时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private String updateTime; // 更新时间
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getGoodsId() {
+		return goodsId;
+	}
+	public void setGoodsId(String goodsId) {
+		this.goodsId = goodsId;
+	}
+
+	public String getSkuSn() {
+		return skuSn;
+	}
+	public void setSkuSn(String skuSn) {
+		this.skuSn = skuSn;
+	}
+
+	public Integer getGoodsCount() {
+		return goodsCount;
+	}
+	public void setGoodsCount(Integer goodsCount) {
+		this.goodsCount = goodsCount;
+	}
+
+	public BigDecimal getPrice() {
+		return price;
+	}
+	public void setPrice(BigDecimal price) {
+		this.price = price;
+	}
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	public Integer getPayStatus() {
+		return payStatus;
+	}
+	public void setPayStatus(Integer payStatus) {
+		this.payStatus = payStatus;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 138 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/CommerceOrder.java

@@ -0,0 +1,138 @@
+package com.fdkankan.goods.entity;
+import java.math.BigDecimal;
+
+
+public class CommerceOrder implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String orderSn; // 订单号
+	private BigDecimal amount; // 金额
+	private String number; // 支付宝的交易号或者微信支付订单号
+	private Integer payType; // 付款方式,0表示微信,1表示支付宝,2表示paypal,3表示其他
+	private Integer payStatus; // 状态,0或-1表示未付款,1表示已付款
+	private String tradeTime; // 交易时间
+	private String userId; // 用户表t_user的id
+	private String cameraId; // 相机主表t_camera的id
+	private Integer commerceType; // 0表示年,1表示月
+	private Integer count; // 数量
+	private Integer abroad; // 0表示国内订单,1表示国外订单
+	private String createTime; // 创建时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private String updateTime; // 更新时间
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getOrderSn() {
+		return orderSn;
+	}
+	public void setOrderSn(String orderSn) {
+		this.orderSn = orderSn;
+	}
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	public String getNumber() {
+		return number;
+	}
+	public void setNumber(String number) {
+		this.number = number;
+	}
+
+	public Integer getPayType() {
+		return payType;
+	}
+	public void setPayType(Integer payType) {
+		this.payType = payType;
+	}
+
+	public Integer getPayStatus() {
+		return payStatus;
+	}
+	public void setPayStatus(Integer payStatus) {
+		this.payStatus = payStatus;
+	}
+
+	public String getTradeTime() {
+		return tradeTime;
+	}
+	public void setTradeTime(String tradeTime) {
+		this.tradeTime = tradeTime;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getCameraId() {
+		return cameraId;
+	}
+	public void setCameraId(String cameraId) {
+		this.cameraId = cameraId;
+	}
+
+	public Integer getCommerceType() {
+		return commerceType;
+	}
+	public void setCommerceType(Integer commerceType) {
+		this.commerceType = commerceType;
+	}
+
+	public Integer getCount() {
+		return count;
+	}
+	public void setCount(Integer count) {
+		this.count = count;
+	}
+
+	public Integer getAbroad() {
+		return abroad;
+	}
+	public void setAbroad(Integer abroad) {
+		this.abroad = abroad;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 113 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/Company.java

@@ -0,0 +1,113 @@
+package com.fdkankan.goods.entity;
+
+
+public class Company implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String companyName; // 公司名称
+	private String topLogo; // 顶部logo
+	private String floorLogo; // 地面logo
+	private String markerLogo; // 地面点位logo
+	private String qrLogo; // 二维码logo
+	private Integer showLogo; // 是否显示初始logo,0隐藏,1显示
+	private String managerId; // t_manager表的id
+	private Integer cameraDelete; // 新增的相机是否注册,0否,1删
+	private String createTime; // 创建时间
+	private String updateTime; // 更新时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public String getTopLogo() {
+		return topLogo;
+	}
+	public void setTopLogo(String topLogo) {
+		this.topLogo = topLogo;
+	}
+
+	public String getFloorLogo() {
+		return floorLogo;
+	}
+	public void setFloorLogo(String floorLogo) {
+		this.floorLogo = floorLogo;
+	}
+
+	public String getMarkerLogo() {
+		return markerLogo;
+	}
+	public void setMarkerLogo(String markerLogo) {
+		this.markerLogo = markerLogo;
+	}
+
+	public String getQrLogo() {
+		return qrLogo;
+	}
+	public void setQrLogo(String qrLogo) {
+		this.qrLogo = qrLogo;
+	}
+
+	public Integer getShowLogo() {
+		return showLogo;
+	}
+	public void setShowLogo(Integer showLogo) {
+		this.showLogo = showLogo;
+	}
+
+	public String getManagerId() {
+		return managerId;
+	}
+	public void setManagerId(String managerId) {
+		this.managerId = managerId;
+	}
+
+	public Integer getCameraDelete() {
+		return cameraDelete;
+	}
+	public void setCameraDelete(Integer cameraDelete) {
+		this.cameraDelete = cameraDelete;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 146 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/DownloadOrder.java

@@ -0,0 +1,146 @@
+package com.fdkankan.goods.entity;
+import java.math.BigDecimal;
+
+
+public class DownloadOrder implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String orderSn; // 订单号
+	private BigDecimal amount; // 金额
+	private String number; // 支付宝的交易号或者微信支付订单号
+	private Integer payType; // 付款方式,0表示微信,1表示支付宝,2表示paypal,3表示其他
+	private Integer payStatus; // 状态,0或-1表示未付款,-2表示已退款,1表示已付款
+	private Integer downStatus; // 状态,1增加下载次数
+	private String tradeTime; // 交易时间
+	private String userId; // 用户表t_user的id
+	private Integer count; // 购买数量
+	private Integer abroad; // 0表示国内订单,1表示国外订单
+	private String createTime; // 创建时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private String updateTime; // 更新时间
+	private String sceneNum; // 场景码
+	private String sceneName; // 场景名
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getOrderSn() {
+		return orderSn;
+	}
+	public void setOrderSn(String orderSn) {
+		this.orderSn = orderSn;
+	}
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	public String getNumber() {
+		return number;
+	}
+	public void setNumber(String number) {
+		this.number = number;
+	}
+
+	public Integer getPayType() {
+		return payType;
+	}
+	public void setPayType(Integer payType) {
+		this.payType = payType;
+	}
+
+	public Integer getPayStatus() {
+		return payStatus;
+	}
+	public void setPayStatus(Integer payStatus) {
+		this.payStatus = payStatus;
+	}
+
+	public Integer getDownStatus() {
+		return downStatus;
+	}
+	public void setDownStatus(Integer downStatus) {
+		this.downStatus = downStatus;
+	}
+
+	public String getTradeTime() {
+		return tradeTime;
+	}
+	public void setTradeTime(String tradeTime) {
+		this.tradeTime = tradeTime;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public Integer getCount() {
+		return count;
+	}
+	public void setCount(Integer count) {
+		this.count = count;
+	}
+
+	public Integer getAbroad() {
+		return abroad;
+	}
+	public void setAbroad(Integer abroad) {
+		this.abroad = abroad;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getSceneNum() {
+		return sceneNum;
+	}
+	public void setSceneNum(String sceneNum) {
+		this.sceneNum = sceneNum;
+	}
+
+	public String getSceneName() {
+		return sceneName;
+	}
+	public void setSceneName(String sceneName) {
+		this.sceneName = sceneName;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 170 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/ExpansionOrder.java

@@ -0,0 +1,170 @@
+package com.fdkankan.goods.entity;
+import java.math.BigDecimal;
+
+
+public class ExpansionOrder implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String orderSn; // 订单号
+	private BigDecimal amount; // 金额
+	private String number; // 支付宝的交易号或者微信支付订单号
+	private Integer payType; // 付款方式,0表示微信,1表示支付宝,2表示paypal,3表示其他
+	private Integer payStatus; // 状态,0或-1表示未付款,-2表示已退款,1表示已付款
+	private Integer status; // 状态,1表示充值,0表示系统赠送,2表示升级套餐
+	private String tradeTime; // 交易时间
+	private String userId; // 用户表t_user的id
+	private Integer month; // 期限,月为单位
+	private Integer years; // 期限,年为单位
+	private Integer delay; // 延期,天为单位
+	private Integer unitSize; // 容量大小
+	private String unit; // 容量单位,\"GB\", \"TB\", \"PB\"
+	private String cameraId; // 相机主表t_camera的id
+	private Integer abroad; // 0表示国内订单,1表示国外订单
+	private String createTime; // 创建时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private String updateTime; // 更新时间
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getOrderSn() {
+		return orderSn;
+	}
+	public void setOrderSn(String orderSn) {
+		this.orderSn = orderSn;
+	}
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	public String getNumber() {
+		return number;
+	}
+	public void setNumber(String number) {
+		this.number = number;
+	}
+
+	public Integer getPayType() {
+		return payType;
+	}
+	public void setPayType(Integer payType) {
+		this.payType = payType;
+	}
+
+	public Integer getPayStatus() {
+		return payStatus;
+	}
+	public void setPayStatus(Integer payStatus) {
+		this.payStatus = payStatus;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public String getTradeTime() {
+		return tradeTime;
+	}
+	public void setTradeTime(String tradeTime) {
+		this.tradeTime = tradeTime;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public Integer getMonth() {
+		return month;
+	}
+	public void setMonth(Integer month) {
+		this.month = month;
+	}
+
+	public Integer getYears() {
+		return years;
+	}
+	public void setYears(Integer years) {
+		this.years = years;
+	}
+
+	public Integer getDelay() {
+		return delay;
+	}
+	public void setDelay(Integer delay) {
+		this.delay = delay;
+	}
+
+	public Integer getUnitSize() {
+		return unitSize;
+	}
+	public void setUnitSize(Integer unitSize) {
+		this.unitSize = unitSize;
+	}
+
+	public String getUnit() {
+		return unit;
+	}
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+
+	public String getCameraId() {
+		return cameraId;
+	}
+	public void setCameraId(String cameraId) {
+		this.cameraId = cameraId;
+	}
+
+	public Integer getAbroad() {
+		return abroad;
+	}
+	public void setAbroad(Integer abroad) {
+		this.abroad = abroad;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 130 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/Goods.java

@@ -0,0 +1,130 @@
+package com.fdkankan.goods.entity;
+import java.math.BigDecimal;
+
+
+public class Goods implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String goodName; // 商品名称
+	private String description; // 商品描述
+	private String goodsSn; // 商品编号
+	private String goodsStatus; // 商品状态,上架下架
+	private String imageUrl; // 商品图片
+	private String pic; // 商品图片2
+	private BigDecimal expressPrice; // 快递价格
+	private Integer sort; // 排序
+	private BigDecimal goodsPrice; // 价格
+	private BigDecimal goodsDollarPrice; // 价格(美元)
+	private String createTime; // 创建时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private String updateTime; // 更新时间
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getGoodName() {
+		return goodName;
+	}
+	public void setGoodName(String goodName) {
+		this.goodName = goodName;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getGoodsSn() {
+		return goodsSn;
+	}
+	public void setGoodsSn(String goodsSn) {
+		this.goodsSn = goodsSn;
+	}
+
+	public String getGoodsStatus() {
+		return goodsStatus;
+	}
+	public void setGoodsStatus(String goodsStatus) {
+		this.goodsStatus = goodsStatus;
+	}
+
+	public String getImageUrl() {
+		return imageUrl;
+	}
+	public void setImageUrl(String imageUrl) {
+		this.imageUrl = imageUrl;
+	}
+
+	public String getPic() {
+		return pic;
+	}
+	public void setPic(String pic) {
+		this.pic = pic;
+	}
+
+	public BigDecimal getExpressPrice() {
+		return expressPrice;
+	}
+	public void setExpressPrice(BigDecimal expressPrice) {
+		this.expressPrice = expressPrice;
+	}
+
+	public Integer getSort() {
+		return sort;
+	}
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+	public BigDecimal getGoodsPrice() {
+		return goodsPrice;
+	}
+	public void setGoodsPrice(BigDecimal goodsPrice) {
+		this.goodsPrice = goodsPrice;
+	}
+
+	public BigDecimal getGoodsDollarPrice() {
+		return goodsDollarPrice;
+	}
+	public void setGoodsDollarPrice(BigDecimal goodsDollarPrice) {
+		this.goodsDollarPrice = goodsDollarPrice;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 122 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/GoodsSku.java

@@ -0,0 +1,122 @@
+package com.fdkankan.goods.entity;
+import java.math.BigDecimal;
+
+
+public class GoodsSku implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String goodsId; // 商品表t_goods的id
+	private String skuSn; // sku编号,唯一
+	private String description; // 规格描述
+	private Integer stock; // 库存,-1指充足
+	private BigDecimal price; // 价格(RMB)
+	private BigDecimal dollarPrice; // 价格(美元)
+	private Integer unitSize; // 容量大小
+	private String unit; // 容量单位,\"GB\", \"TB\", \"PB\"
+	private Integer month; // 容量时长
+	private String createTime; // 创建时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private String updateTime; // 更新时间
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getGoodsId() {
+		return goodsId;
+	}
+	public void setGoodsId(String goodsId) {
+		this.goodsId = goodsId;
+	}
+
+	public String getSkuSn() {
+		return skuSn;
+	}
+	public void setSkuSn(String skuSn) {
+		this.skuSn = skuSn;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Integer getStock() {
+		return stock;
+	}
+	public void setStock(Integer stock) {
+		this.stock = stock;
+	}
+
+	public BigDecimal getPrice() {
+		return price;
+	}
+	public void setPrice(BigDecimal price) {
+		this.price = price;
+	}
+
+	public BigDecimal getDollarPrice() {
+		return dollarPrice;
+	}
+	public void setDollarPrice(BigDecimal dollarPrice) {
+		this.dollarPrice = dollarPrice;
+	}
+
+	public Integer getUnitSize() {
+		return unitSize;
+	}
+	public void setUnitSize(Integer unitSize) {
+		this.unitSize = unitSize;
+	}
+
+	public String getUnit() {
+		return unit;
+	}
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+
+	public Integer getMonth() {
+		return month;
+	}
+	public void setMonth(Integer month) {
+		this.month = month;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 56 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/GoodsSpec.java

@@ -0,0 +1,56 @@
+package com.fdkankan.goods.entity;
+
+public class GoodsSpec implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String specName; // 规格名称
+	private String createTime; // 创建时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private String updateTime; // 更新时间
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getSpecName() {
+		return specName;
+	}
+	public void setSpecName(String specName) {
+		this.specName = specName;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 65 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/GoodsSpecValue.java

@@ -0,0 +1,65 @@
+package com.fdkankan.goods.entity;
+
+
+public class GoodsSpecValue implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String goodsSpecId; // 规格id
+	private String goodsSpecValue; // 规格值
+	private String createTime; // 创建时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private String updateTime; // 更新时间
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getGoodsSpecId() {
+		return goodsSpecId;
+	}
+	public void setGoodsSpecId(String goodsSpecId) {
+		this.goodsSpecId = goodsSpecId;
+	}
+
+	public String getGoodsSpecValue() {
+		return goodsSpecValue;
+	}
+	public void setGoodsSpecValue(String goodsSpecValue) {
+		this.goodsSpecValue = goodsSpecValue;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 65 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/entity/GoodsSpuSpec.java

@@ -0,0 +1,65 @@
+package com.fdkankan.goods.entity;
+
+
+public class GoodsSpuSpec implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id; // 
+	private String goodsId; // 商品表id
+	private String goodsSpecId; // 商品规格表id
+	private String createTime; // 创建时间
+	private String recStatus; // 记录的状态,A: 生效,I: 禁用
+	private String updateTime; // 更新时间
+	private Integer tbStatus; // 0正常,1删除
+
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getGoodsId() {
+		return goodsId;
+	}
+	public void setGoodsId(String goodsId) {
+		this.goodsId = goodsId;
+	}
+
+	public String getGoodsSpecId() {
+		return goodsSpecId;
+	}
+	public void setGoodsSpecId(String goodsSpecId) {
+		this.goodsSpecId = goodsSpecId;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getRecStatus() {
+		return recStatus;
+	}
+	public void setRecStatus(String recStatus) {
+		this.recStatus = recStatus;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Integer getTbStatus() {
+		return tbStatus;
+	}
+	public void setTbStatus(Integer tbStatus) {
+		this.tbStatus = tbStatus;
+	}
+
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICameraDetailMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.CameraDetail;
+
+public interface ICameraDetailMapper extends IOperations<CameraDetail> {
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICameraMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.Camera;
+
+public interface ICameraMapper extends IOperations<Camera> {
+}
+

+ 7 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICameraOutMapper.java

@@ -0,0 +1,7 @@
+package com.fdkankan.goods.mapper;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.CameraOut;
+
+public interface ICameraOutMapper extends IOperations<CameraOut> {
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICameraSpaceMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.CameraSpace;
+
+public interface ICameraSpaceMapper extends IOperations<CameraSpace> {
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICameraVersionMapper.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.mapper;
+
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.CameraVersion;
+
+public interface ICameraVersionMapper extends IOperations<CameraVersion> {
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICartMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.Cart;
+
+public interface ICartMapper extends IOperations<Cart> {
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICommerceOrderMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.CommerceOrder;
+
+public interface ICommerceOrderMapper extends IOperations<CommerceOrder> {
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/ICompanyMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.Company;
+
+public interface ICompanyMapper extends IOperations<Company> {
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IDownloadOrderMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.DownloadOrder;
+
+public interface IDownloadOrderMapper extends IOperations<DownloadOrder> {
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IExpansionOrderMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.ExpansionOrder;
+
+public interface IExpansionOrderMapper extends IOperations<ExpansionOrder> {
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IGoodsMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.Goods;
+
+public interface IGoodsMapper extends IOperations<Goods> {
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IGoodsSkuMapper.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.mapper;
+
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.GoodsSku;
+
+public interface IGoodsSkuMapper extends IOperations<GoodsSku> {
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IGoodsSpecMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.GoodsSpec;
+
+public interface IGoodsSpecMapper extends IOperations<GoodsSpec> {
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IGoodsSpecValueMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.GoodsSpecValue;
+
+public interface IGoodsSpecValueMapper extends IOperations<GoodsSpecValue> {
+}
+

+ 8 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/mapper/IGoodsSpuSpecMapper.java

@@ -0,0 +1,8 @@
+package com.fdkankan.goods.mapper;
+
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.GoodsSpuSpec;
+
+public interface IGoodsSpuSpecMapper extends IOperations<GoodsSpuSpec> {
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICameraDetailService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.CameraDetail;
+
+public interface ICameraDetailService extends IServiceOperations<CameraDetail> {
+
+}
+

+ 10 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICameraOutService.java

@@ -0,0 +1,10 @@
+package com.fdkankan.goods.service;
+
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.CameraOut;
+
+public interface ICameraOutService extends IServiceOperations<CameraOut> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICameraService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.Camera;
+
+public interface ICameraService extends IServiceOperations<Camera> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICameraSpaceService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.CameraSpace;
+
+public interface ICameraSpaceService extends IServiceOperations<CameraSpace> {
+
+}
+

+ 10 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICameraVersionService.java

@@ -0,0 +1,10 @@
+package com.fdkankan.goods.service;
+
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.CameraVersion;
+
+public interface ICameraVersionService extends IServiceOperations<CameraVersion> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICartService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.Cart;
+
+public interface ICartService extends IServiceOperations<Cart> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICommerceOrderService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.CommerceOrder;
+
+public interface ICommerceOrderService extends IServiceOperations<CommerceOrder> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/ICompanyService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.Company;
+
+public interface ICompanyService extends IServiceOperations<Company> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IDownloadOrderService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.DownloadOrder;
+
+public interface IDownloadOrderService extends IServiceOperations<DownloadOrder> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IExpansionOrderService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.ExpansionOrder;
+
+public interface IExpansionOrderService extends IServiceOperations<ExpansionOrder> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IGoodsService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.Goods;
+
+public interface IGoodsService extends IServiceOperations<Goods> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IGoodsSkuService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.GoodsSku;
+
+public interface IGoodsSkuService extends IServiceOperations<GoodsSku> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IGoodsSpecService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.GoodsSpec;
+
+public interface IGoodsSpecService extends IServiceOperations<GoodsSpec> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IGoodsSpecValueService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.GoodsSpecValue;
+
+public interface IGoodsSpecValueService extends IServiceOperations<GoodsSpecValue> {
+
+}
+

+ 9 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/IGoodsSpuSpecService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.goods.service;
+
+import com.fdkankan.common.base.IServiceOperations;
+import com.fdkankan.goods.entity.GoodsSpuSpec;
+
+public interface IGoodsSpuSpecService extends IServiceOperations<GoodsSpuSpec> {
+
+}
+

+ 31 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CameraDetailService.java

@@ -0,0 +1,31 @@
+package com.fdkankan.goods.service.impl;
+
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.CameraDetail;
+import com.fdkankan.goods.mapper.ICameraDetailMapper;
+import com.fdkankan.goods.service.ICameraDetailService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("CameraDetailService")
+public class CameraDetailService extends AbstractService<CameraDetail> implements ICameraDetailService {
+
+	public CameraDetailService() {
+		this.setTableName("t_camera_detail");
+	}
+	@Resource
+	private ICameraDetailMapper tCameraDetailMapper;
+
+	@Override
+	protected IOperations<CameraDetail> getMapper() {
+		return tCameraDetailMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CameraOutService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.CameraOut;
+import com.fdkankan.goods.mapper.ICameraOutMapper;
+import com.fdkankan.goods.service.ICameraOutService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("CameraOutService")
+public class CameraOutService extends AbstractService<CameraOut> implements ICameraOutService {
+
+	public CameraOutService() {
+		this.setTableName("t_camera_out");
+	}
+	@Resource
+	private ICameraOutMapper tCameraOutMapper;
+
+	@Override
+	protected IOperations<CameraOut> getMapper() {
+		return tCameraOutMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CameraService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.Camera;
+import com.fdkankan.goods.mapper.ICameraMapper;
+import com.fdkankan.goods.service.ICameraService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("CameraService")
+public class CameraService extends AbstractService<Camera> implements ICameraService {
+
+	public CameraService() {
+		this.setTableName("t_camera");
+	}
+	@Resource
+	private ICameraMapper tCameraMapper;
+
+	@Override
+	protected IOperations<Camera> getMapper() {
+		return tCameraMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 31 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CameraSpaceService.java

@@ -0,0 +1,31 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.CameraSpace;
+import com.fdkankan.goods.mapper.ICameraSpaceMapper;
+import com.fdkankan.goods.service.ICameraSpaceService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+@Service("CameraSpaceService")
+public class CameraSpaceService extends AbstractService<CameraSpace> implements ICameraSpaceService {
+
+	public CameraSpaceService() {
+		this.setTableName("t_camera_space");
+	}
+	@Resource
+	private ICameraSpaceMapper tCameraSpaceMapper;
+
+	@Override
+	protected IOperations<CameraSpace> getMapper() {
+		return tCameraSpaceMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CameraVersionService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.CameraVersion;
+import com.fdkankan.goods.mapper.ICameraVersionMapper;
+import com.fdkankan.goods.service.ICameraVersionService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("CameraVersionService")
+public class CameraVersionService extends AbstractService<CameraVersion> implements ICameraVersionService {
+
+	public CameraVersionService() {
+		this.setTableName("t_camera_version");
+	}
+	@Resource
+	private ICameraVersionMapper tCameraVersionMapper;
+
+	@Override
+	protected IOperations<CameraVersion> getMapper() {
+		return tCameraVersionMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 31 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CartService.java

@@ -0,0 +1,31 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.Cart;
+import com.fdkankan.goods.mapper.ICartMapper;
+import com.fdkankan.goods.service.ICartService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+@Service("CartService")
+public class CartService extends AbstractService<Cart> implements ICartService {
+
+	public CartService() {
+		this.setTableName("t_cart");
+	}
+	@Resource
+	private ICartMapper tCartMapper;
+
+	@Override
+	protected IOperations<Cart> getMapper() {
+		return tCartMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CommerceOrderService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.CommerceOrder;
+import com.fdkankan.goods.mapper.ICommerceOrderMapper;
+import com.fdkankan.goods.service.ICommerceOrderService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("CommerceOrderService")
+public class CommerceOrderService extends AbstractService<CommerceOrder> implements ICommerceOrderService {
+
+	public CommerceOrderService() {
+		this.setTableName("t_commerce_order");
+	}
+	@Resource
+	private ICommerceOrderMapper tCommerceOrderMapper;
+
+	@Override
+	protected IOperations<CommerceOrder> getMapper() {
+		return tCommerceOrderMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/CompanyService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.Company;
+import com.fdkankan.goods.mapper.ICompanyMapper;
+import com.fdkankan.goods.service.ICompanyService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("CompanyService")
+public class CompanyService extends AbstractService<Company> implements ICompanyService {
+
+	public CompanyService() {
+		this.setTableName("t_company");
+	}
+	@Resource
+	private ICompanyMapper tCompanyMapper;
+
+	@Override
+	protected IOperations<Company> getMapper() {
+		return tCompanyMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/DownloadOrderService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.DownloadOrder;
+import com.fdkankan.goods.mapper.IDownloadOrderMapper;
+import com.fdkankan.goods.service.IDownloadOrderService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("DownloadOrderService")
+public class DownloadOrderService extends AbstractService<DownloadOrder> implements IDownloadOrderService {
+
+	public DownloadOrderService() {
+		this.setTableName("t_download_order");
+	}
+	@Resource
+	private IDownloadOrderMapper tDownloadOrderMapper;
+
+	@Override
+	protected IOperations<DownloadOrder> getMapper() {
+		return tDownloadOrderMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/ExpansionOrderService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.ExpansionOrder;
+import com.fdkankan.goods.mapper.IExpansionOrderMapper;
+import com.fdkankan.goods.service.IExpansionOrderService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("ExpansionOrderService")
+public class ExpansionOrderService extends AbstractService<ExpansionOrder> implements IExpansionOrderService {
+
+	public ExpansionOrderService() {
+		this.setTableName("t_expansion_order");
+	}
+	@Resource
+	private IExpansionOrderMapper tExpansionOrderMapper;
+
+	@Override
+	protected IOperations<ExpansionOrder> getMapper() {
+		return tExpansionOrderMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/GoodsService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.Goods;
+import com.fdkankan.goods.mapper.IGoodsMapper;
+import com.fdkankan.goods.service.IGoodsService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("GoodsService")
+public class GoodsService extends AbstractService<Goods> implements IGoodsService {
+
+	public GoodsService() {
+		this.setTableName("t_goods");
+	}
+	@Resource
+	private IGoodsMapper tGoodsMapper;
+
+	@Override
+	protected IOperations<Goods> getMapper() {
+		return tGoodsMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/GoodsSkuService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.GoodsSku;
+import com.fdkankan.goods.mapper.IGoodsSkuMapper;
+import com.fdkankan.goods.service.IGoodsSkuService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("GoodsSkuService")
+public class GoodsSkuService extends AbstractService<GoodsSku> implements IGoodsSkuService {
+
+	public GoodsSkuService() {
+		this.setTableName("t_goods_sku");
+	}
+	@Resource
+	private IGoodsSkuMapper tGoodsSkuMapper;
+
+	@Override
+	protected IOperations<GoodsSku> getMapper() {
+		return tGoodsSkuMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/GoodsSpecService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.GoodsSpec;
+import com.fdkankan.goods.mapper.IGoodsSpecMapper;
+import com.fdkankan.goods.service.IGoodsSpecService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("GoodsSpecService")
+public class GoodsSpecService extends AbstractService<GoodsSpec> implements IGoodsSpecService {
+
+	public GoodsSpecService() {
+		this.setTableName("t_goods_spec");
+	}
+	@Resource
+	private IGoodsSpecMapper tGoodsSpecMapper;
+
+	@Override
+	protected IOperations<GoodsSpec> getMapper() {
+		return tGoodsSpecMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/GoodsSpecValueService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.GoodsSpecValue;
+import com.fdkankan.goods.mapper.IGoodsSpecValueMapper;
+import com.fdkankan.goods.service.IGoodsSpecValueService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("GoodsSpecValueService")
+public class GoodsSpecValueService extends AbstractService<GoodsSpecValue> implements IGoodsSpecValueService {
+
+	public GoodsSpecValueService() {
+		this.setTableName("t_goods_spec_value");
+	}
+	@Resource
+	private IGoodsSpecValueMapper tGoodsSpecValueMapper;
+
+	@Override
+	protected IOperations<GoodsSpecValue> getMapper() {
+		return tGoodsSpecValueMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 30 - 0
4dkankan-center-goods/src/main/java/com/fdkankan/goods/service/impl/GoodsSpuSpecService.java

@@ -0,0 +1,30 @@
+package com.fdkankan.goods.service.impl;
+
+import com.fdkankan.common.base.AbstractService;
+import com.fdkankan.common.base.IOperations;
+import com.fdkankan.goods.entity.GoodsSpuSpec;
+import com.fdkankan.goods.mapper.IGoodsSpuSpecMapper;
+import com.fdkankan.goods.service.IGoodsSpuSpecService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("GoodsSpuSpecService")
+public class GoodsSpuSpecService extends AbstractService<GoodsSpuSpec> implements IGoodsSpuSpecService {
+
+	public GoodsSpuSpecService() {
+		this.setTableName("t_goods_spu_spec");
+	}
+	@Resource
+	private IGoodsSpuSpecMapper tGoodsSpuSpecMapper;
+
+	@Override
+	protected IOperations<GoodsSpuSpec> getMapper() {
+		return tGoodsSpuSpecMapper;
+	}
+	@Override
+	public void setTableName(String tableName){
+		this.tableName = tableName;
+	}
+}
+

+ 39 - 0
4dkankan-center-goods/src/main/resources/application.yml

@@ -0,0 +1,39 @@
+server:
+  port: 8082
+  servlet:
+    context-path: /goods
+  tomcat:
+    accesslog:
+      buffered: true
+      directory: /home/logs/tomcat
+      enabled: true
+      file-date-format: .yyyy-MM-dd
+      pattern: '%t | %{X-Real-IP}i | %b | %B | %H | %l | %m | %p | %q | %r | %s | %S | %u | %U | %v | %D | %T | %{Cookie}i | %{User-Agent}i | %{a}r'
+      prefix: access_log
+      rename-on-rotate: false
+      request-attributes-enabled: false
+      rotate: true
+      suffix: .log
+spring:
+  cloud:
+    nacos:
+      discovery:
+        port: ${discoveryPort:8848}
+        server-addr: 127.0.0.1
+  application:
+    name: goods
+  datasource:
+    name: test
+    url: jdbc:mysql://localhost:3306/4dkankan_center_application?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC&allowMultiQueries=true
+    username: root
+    password: 123456
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+mybatis:
+  mapper-locations: classpath:mapper/*/*.xml
+  type-aliases-package: com.4dkankan_center_application.www
+  configuration:
+    map-underscore-to-camel-case: true
+logging:
+  config: classpath:logback-spring.xml
+

+ 230 - 0
4dkankan-center-goods/src/main/resources/logback-spring.xml

@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL,如果设置为WARN,则低于WARN的信息都不会输出 -->
+<!-- scan:当此属性设置为true时,配置文件如果发生改变,将会被重新加载,默认值为true -->
+<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔,如果没有给出时间单位,默认单位是毫秒。当scan为true时,此属性生效。默认的时间间隔为1分钟。 -->
+<!-- debug:当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。 -->
+<configuration scan="true" scanPeriod="10 seconds">
+
+	<contextName>logback</contextName>
+	<!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
+	<property name="log.path" value="/home/logs/4dkankan_center_application" />
+
+	<!-- 彩色日志 -->
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN"
+		value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+
+	<!--输出到控制台 -->
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<!--此日志appender是为开发使用,只配置最底级别,控制台输出的日志级别是大于或等于此级别的日志信息 -->
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>info</level>
+		</filter>
+		<encoder>
+			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+			<!-- 设置字符集 -->
+			<charset>UTF-8</charset>
+		</encoder>
+	</appender>
+	<!--输出到文件 -->
+
+	<!-- 时间滚动输出 level为 DEBUG 日志 -->
+	<appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/log_debug.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset> <!-- 设置字符集 -->
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<!-- 日志归档 -->
+			<fileNamePattern>${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录debug级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<level>debug</level>
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+
+	<!-- 时间滚动输出 level为 INFO 日志 -->
+	<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/log_info.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset>
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<!-- 每天日志归档路径以及格式 -->
+			<fileNamePattern>${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录info级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<level>info</level>
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+
+	<!-- 时间滚动输出 level为 WARN 日志 -->
+	<appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/log_warn.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录warn级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<level>warn</level>
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+
+
+	<!-- 时间滚动输出 level为 ERROR 日志 -->
+	<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/log_error.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录ERROR级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<level>ERROR</level>
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+	
+	<appender name="PROGRAM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/program/log_program.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/program/log-program-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录ERROR级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+	<logger name="programLog" level="INFO" additivity="true">
+        <appender-ref ref="PROGRAM_FILE"/>
+    </logger>
+
+	<appender name="VISIT_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<!-- 正在记录的日志文件的路径及文件名 -->
+		<file>${log.path}/visit/log_visit.log</file>
+		<!--日志文件输出格式 -->
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
+		</encoder>
+		<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/visit/log-visit-%d{yyyy-MM-dd}.%i.log
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!--日志文件保留天数 -->
+			<maxHistory>15</maxHistory>
+		</rollingPolicy>
+		<!-- 此日志文件只记录ERROR级别的 -->
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+			<onMatch>ACCEPT</onMatch>
+			<onMismatch>DENY</onMismatch>
+		</filter>
+	</appender>
+	<logger name="visitLog" level="INFO" additivity="true">
+        <appender-ref ref="VISIT_FILE"/>
+    </logger>
+
+	<!-- <logger>用来设置某一个包或者具体的某一个类的日志打印级别、 以及指定<appender>。<logger>仅有一个name属性, 一个可选的level和一个可选的addtivity属性。 name:用来指定受此logger约束的某一个包或者具体的某一个类。 level:用来设置打印级别,大小写无关:TRACE, 
+		DEBUG, INFO, WARN, ERROR, ALL 和 OFF, 还有一个特俗值INHERITED或者同义词NULL,代表强制执行上级的级别。 如果未设置此属性,那么当前logger将会继承上级的级别。 addtivity:是否向上级logger传递打印信息。默认是true。 -->
+	<!--<logger name="org.springframework.web" level="info"/> -->
+	<!--<logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/> -->
+	<!-- 使用mybatis的时候,sql语句是debug下才会打印,而这里我们只配置了info,所以想要查看sql语句的话,有以下两种操作: 第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql,不过这样日志那边会出现很多其他消息 第二种就是单独给dao下目录配置debug模式,代码如下,这样配置sql语句会打印,其他还是正常info级别: -->
+	<!-- root节点是必选节点,用来指定最基础的日志输出级别,只有一个level属性 level:用来设置打印级别,大小写无关:TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF, 不能设置为INHERITED或者同义词NULL。默认是DEBUG 可以包含零个或多个元素,标识这个appender将会添加到这个logger。 -->
+
+	<root level="info">
+		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="DEBUG_FILE" />
+		<appender-ref ref="INFO_FILE" />
+		<appender-ref ref="WARN_FILE" />
+		<appender-ref ref="ERROR_FILE" />
+	</root>
+
+	<!--生产环境:输出到文件 -->
+	<!--<springProfile name="pro"> -->
+	<!--<root level="info"> -->
+	<!--<appender-ref ref="CONSOLE" /> -->
+	<!--<appender-ref ref="DEBUG_FILE" /> -->
+	<!--<appender-ref ref="INFO_FILE" /> -->
+	<!--<appender-ref ref="ERROR_FILE" /> -->
+	<!--<appender-ref ref="WARN_FILE" /> -->
+	<!--</root> -->
+	<!--</springProfile> -->
+
+</configuration>
+
+

File diff suppressed because it is too large
+ 128 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/CameraDetailMapper.xml


+ 119 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/CameraMapper.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.goods.mapper.ICameraMapper">
+	<resultMap id="resultMap" type="com.fdkankan.goods.entity.Camera">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="child_name" jdbcType="VARCHAR" property="childName" />
+		<result column="activated_time" jdbcType="TIMESTAMP" property="activatedTime" />
+		<result column="child_password" jdbcType="VARCHAR" property="childPassword" />
+		<result column="sn_code" jdbcType="VARCHAR" property="snCode" />
+		<result column="wifi_name" jdbcType="VARCHAR" property="wifiName" />
+		<result column="wifi_password" jdbcType="VARCHAR" property="wifiPassword" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,child_name,activated_time,child_password,sn_code,wifi_name,wifi_password,create_time,update_time,rec_status,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		child_name, activated_time, child_password, sn_code, wifi_name, wifi_password, rec_status
+		) VALUES (
+		#{entity.childName}, #{entity.activatedTime}, #{entity.childPassword}, #{entity.snCode}, #{entity.wifiName}, #{entity.wifiPassword}, #{entity.recStatus}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		child_name, activated_time, child_password, sn_code, wifi_name, wifi_password, rec_status
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.childName}, #{entity.activatedTime}, #{entity.childPassword}, #{entity.snCode}, #{entity.wifiName}, #{entity.wifiPassword}, #{entity.recStatus})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		child_name=#{entity.childName}, activated_time=#{entity.activatedTime}, child_password=#{entity.childPassword}, sn_code=#{entity.snCode}, wifi_name=#{entity.wifiName}, wifi_password=#{entity.wifiPassword}, rec_status=#{entity.recStatus}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 117 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/CameraOutMapper.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.goods.mapper.ICameraOutMapper">
+	<resultMap id="resultMap" type="com.fdkankan.goods.entity.CameraOut">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="camera_id" jdbcType="VARCHAR" property="cameraId" />
+		<result column="order_id" jdbcType="VARCHAR" property="orderId" />
+		<result column="agent_name" jdbcType="VARCHAR" property="agentName" />
+		<result column="out_type" jdbcType="INTEGER" property="outType" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,camera_id,order_id,agent_name,out_type,create_time,update_time,rec_status,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		camera_id, order_id, agent_name, out_type, rec_status
+		) VALUES (
+		#{entity.cameraId}, #{entity.orderId}, #{entity.agentName}, #{entity.outType}, #{entity.recStatus}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		camera_id, order_id, agent_name, out_type, rec_status
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.cameraId}, #{entity.orderId}, #{entity.agentName}, #{entity.outType}, #{entity.recStatus})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		camera_id=#{entity.cameraId}, order_id=#{entity.orderId}, agent_name=#{entity.agentName}, out_type=#{entity.outType}, rec_status=#{entity.recStatus}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 120 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/CameraSpaceMapper.xml

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.goods.mapper.ICameraSpaceMapper">
+	<resultMap id="resultMap" type="com.fdkankan.goods.entity.CameraSpace">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="user_id" jdbcType="VARCHAR" property="userId" />
+		<result column="camera_id" jdbcType="VARCHAR" property="cameraId" />
+		<result column="space" jdbcType="VARCHAR" property="space" />
+		<result column="space_type" jdbcType="INTEGER" property="spaceType" />
+		<result column="space_start_time" jdbcType="TIMESTAMP" property="spaceStartTime" />
+		<result column="space_end_time" jdbcType="TIMESTAMP" property="spaceEndTime" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="order_sn" jdbcType="LONGVARCHAR" property="orderSn" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,user_id,camera_id,space,space_type,space_start_time,space_end_time,create_time,rec_status,update_time,order_sn,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		user_id, camera_id, space, space_type, space_start_time, space_end_time, rec_status, order_sn
+		) VALUES (
+		#{entity.userId}, #{entity.cameraId}, #{entity.space}, #{entity.spaceType}, #{entity.spaceStartTime}, #{entity.spaceEndTime}, #{entity.recStatus}, #{entity.orderSn}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		user_id, camera_id, space, space_type, space_start_time, space_end_time, rec_status, order_sn
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.userId}, #{entity.cameraId}, #{entity.space}, #{entity.spaceType}, #{entity.spaceStartTime}, #{entity.spaceEndTime}, #{entity.recStatus}, #{entity.orderSn})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		user_id=#{entity.userId}, camera_id=#{entity.cameraId}, space=#{entity.space}, space_type=#{entity.spaceType}, space_start_time=#{entity.spaceStartTime}, space_end_time=#{entity.spaceEndTime}, rec_status=#{entity.recStatus}, order_sn=#{entity.orderSn}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 121 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/CameraVersionMapper.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.goods.mapper.ICameraVersionMapper">
+	<resultMap id="resultMap" type="com.fdkankan.goods.entity.CameraVersion">
+		<id column="id" jdbcType="INTEGER" property="id" />
+		<result column="file_name" jdbcType="VARCHAR" property="fileName" />
+		<result column="file_url" jdbcType="VARCHAR" property="fileUrl" />
+		<result column="file_md5" jdbcType="VARCHAR" property="fileMd5" />
+		<result column="description" jdbcType="VARCHAR" property="description" />
+		<result column="version" jdbcType="VARCHAR" property="version" />
+		<result column="camera_type" jdbcType="INTEGER" property="cameraType" />
+		<result column="ac_status" jdbcType="VARCHAR" property="acStatus" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="min_version" jdbcType="VARCHAR" property="minVersion" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,file_name,file_url,file_md5,description,version,camera_type,ac_status,rec_status,create_time,update_time,min_version,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		file_name, file_url, file_md5, description, version, camera_type, ac_status, rec_status, min_version
+		) VALUES (
+		#{entity.fileName}, #{entity.fileUrl}, #{entity.fileMd5}, #{entity.description}, #{entity.version}, #{entity.cameraType}, #{entity.acStatus}, #{entity.recStatus}, #{entity.minVersion}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		file_name, file_url, file_md5, description, version, camera_type, ac_status, rec_status, min_version
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.fileName}, #{entity.fileUrl}, #{entity.fileMd5}, #{entity.description}, #{entity.version}, #{entity.cameraType}, #{entity.acStatus}, #{entity.recStatus}, #{entity.minVersion})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		file_name=#{entity.fileName}, file_url=#{entity.fileUrl}, file_md5=#{entity.fileMd5}, description=#{entity.description}, version=#{entity.version}, camera_type=#{entity.cameraType}, ac_status=#{entity.acStatus}, rec_status=#{entity.recStatus}, min_version=#{entity.minVersion}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 120 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/CartMapper.xml

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.goods.mapper.ICartMapper">
+	<resultMap id="resultMap" type="com.fdkankan.goods.entity.Cart">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="user_id" jdbcType="VARCHAR" property="userId" />
+		<result column="goods_id" jdbcType="VARCHAR" property="goodsId" />
+		<result column="sku_sn" jdbcType="VARCHAR" property="skuSn" />
+		<result column="goods_count" jdbcType="INTEGER" property="goodsCount" />
+		<result column="price" jdbcType="DECIMAL" property="price" />
+		<result column="amount" jdbcType="DECIMAL" property="amount" />
+		<result column="pay_status" jdbcType="INTEGER" property="payStatus" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,user_id,goods_id,sku_sn,goods_count,price,amount,pay_status,create_time,rec_status,update_time,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		user_id, goods_id, sku_sn, goods_count, price, amount, pay_status, rec_status
+		) VALUES (
+		#{entity.userId}, #{entity.goodsId}, #{entity.skuSn}, #{entity.goodsCount}, #{entity.price}, #{entity.amount}, #{entity.payStatus}, #{entity.recStatus}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		user_id, goods_id, sku_sn, goods_count, price, amount, pay_status, rec_status
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.userId}, #{entity.goodsId}, #{entity.skuSn}, #{entity.goodsCount}, #{entity.price}, #{entity.amount}, #{entity.payStatus}, #{entity.recStatus})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		user_id=#{entity.userId}, goods_id=#{entity.goodsId}, sku_sn=#{entity.skuSn}, goods_count=#{entity.goodsCount}, price=#{entity.price}, amount=#{entity.amount}, pay_status=#{entity.payStatus}, rec_status=#{entity.recStatus}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 124 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/CommerceOrderMapper.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.goods.mapper.ICommerceOrderMapper">
+	<resultMap id="resultMap" type="com.fdkankan.goods.entity.CommerceOrder">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="order_sn" jdbcType="VARCHAR" property="orderSn" />
+		<result column="amount" jdbcType="DECIMAL" property="amount" />
+		<result column="number" jdbcType="VARCHAR" property="number" />
+		<result column="pay_type" jdbcType="INTEGER" property="payType" />
+		<result column="pay_status" jdbcType="INTEGER" property="payStatus" />
+		<result column="trade_time" jdbcType="TIMESTAMP" property="tradeTime" />
+		<result column="user_id" jdbcType="VARCHAR" property="userId" />
+		<result column="camera_id" jdbcType="VARCHAR" property="cameraId" />
+		<result column="commerce_type" jdbcType="INTEGER" property="commerceType" />
+		<result column="count" jdbcType="INTEGER" property="count" />
+		<result column="abroad" jdbcType="INTEGER" property="abroad" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,order_sn,amount,number,pay_type,pay_status,trade_time,user_id,camera_id,commerce_type,count,abroad,create_time,rec_status,update_time,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		order_sn, amount, number, pay_type, pay_status, trade_time, user_id, camera_id, commerce_type, count, abroad, rec_status
+		) VALUES (
+		#{entity.orderSn}, #{entity.amount}, #{entity.number}, #{entity.payType}, #{entity.payStatus}, #{entity.tradeTime}, #{entity.userId}, #{entity.cameraId}, #{entity.commerceType}, #{entity.count}, #{entity.abroad}, #{entity.recStatus}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		order_sn, amount, number, pay_type, pay_status, trade_time, user_id, camera_id, commerce_type, count, abroad, rec_status
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.orderSn}, #{entity.amount}, #{entity.number}, #{entity.payType}, #{entity.payStatus}, #{entity.tradeTime}, #{entity.userId}, #{entity.cameraId}, #{entity.commerceType}, #{entity.count}, #{entity.abroad}, #{entity.recStatus})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		order_sn=#{entity.orderSn}, amount=#{entity.amount}, number=#{entity.number}, pay_type=#{entity.payType}, pay_status=#{entity.payStatus}, trade_time=#{entity.tradeTime}, user_id=#{entity.userId}, camera_id=#{entity.cameraId}, commerce_type=#{entity.commerceType}, count=#{entity.count}, abroad=#{entity.abroad}, rec_status=#{entity.recStatus}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 121 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/CompanyMapper.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.goods.mapper.ICompanyMapper">
+	<resultMap id="resultMap" type="com.fdkankan.goods.entity.Company">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="company_name" jdbcType="VARCHAR" property="companyName" />
+		<result column="top_logo" jdbcType="VARCHAR" property="topLogo" />
+		<result column="floor_logo" jdbcType="VARCHAR" property="floorLogo" />
+		<result column="marker_logo" jdbcType="VARCHAR" property="markerLogo" />
+		<result column="qr_logo" jdbcType="VARCHAR" property="qrLogo" />
+		<result column="show_logo" jdbcType="INTEGER" property="showLogo" />
+		<result column="manager_id" jdbcType="VARCHAR" property="managerId" />
+		<result column="camera_delete" jdbcType="INTEGER" property="cameraDelete" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,company_name,top_logo,floor_logo,marker_logo,qr_logo,show_logo,manager_id,camera_delete,create_time,update_time,rec_status,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		company_name, top_logo, floor_logo, marker_logo, qr_logo, show_logo, manager_id, camera_delete, rec_status
+		) VALUES (
+		#{entity.companyName}, #{entity.topLogo}, #{entity.floorLogo}, #{entity.markerLogo}, #{entity.qrLogo}, #{entity.showLogo}, #{entity.managerId}, #{entity.cameraDelete}, #{entity.recStatus}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		company_name, top_logo, floor_logo, marker_logo, qr_logo, show_logo, manager_id, camera_delete, rec_status
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.companyName}, #{entity.topLogo}, #{entity.floorLogo}, #{entity.markerLogo}, #{entity.qrLogo}, #{entity.showLogo}, #{entity.managerId}, #{entity.cameraDelete}, #{entity.recStatus})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		company_name=#{entity.companyName}, top_logo=#{entity.topLogo}, floor_logo=#{entity.floorLogo}, marker_logo=#{entity.markerLogo}, qr_logo=#{entity.qrLogo}, show_logo=#{entity.showLogo}, manager_id=#{entity.managerId}, camera_delete=#{entity.cameraDelete}, rec_status=#{entity.recStatus}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 125 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/DownloadOrderMapper.xml

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.goods.mapper.IDownloadOrderMapper">
+	<resultMap id="resultMap" type="com.fdkankan.goods.entity.DownloadOrder">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="order_sn" jdbcType="VARCHAR" property="orderSn" />
+		<result column="amount" jdbcType="DECIMAL" property="amount" />
+		<result column="number" jdbcType="VARCHAR" property="number" />
+		<result column="pay_type" jdbcType="INTEGER" property="payType" />
+		<result column="pay_status" jdbcType="INTEGER" property="payStatus" />
+		<result column="down_status" jdbcType="INTEGER" property="downStatus" />
+		<result column="trade_time" jdbcType="TIMESTAMP" property="tradeTime" />
+		<result column="user_id" jdbcType="VARCHAR" property="userId" />
+		<result column="count" jdbcType="INTEGER" property="count" />
+		<result column="abroad" jdbcType="INTEGER" property="abroad" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="scene_num" jdbcType="VARCHAR" property="sceneNum" />
+		<result column="scene_name" jdbcType="VARCHAR" property="sceneName" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,order_sn,amount,number,pay_type,pay_status,down_status,trade_time,user_id,count,abroad,create_time,rec_status,update_time,scene_num,scene_name,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		order_sn, amount, number, pay_type, pay_status, down_status, trade_time, user_id, count, abroad, rec_status, scene_num, scene_name
+		) VALUES (
+		#{entity.orderSn}, #{entity.amount}, #{entity.number}, #{entity.payType}, #{entity.payStatus}, #{entity.downStatus}, #{entity.tradeTime}, #{entity.userId}, #{entity.count}, #{entity.abroad}, #{entity.recStatus}, #{entity.sceneNum}, #{entity.sceneName}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		order_sn, amount, number, pay_type, pay_status, down_status, trade_time, user_id, count, abroad, rec_status, scene_num, scene_name
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.orderSn}, #{entity.amount}, #{entity.number}, #{entity.payType}, #{entity.payStatus}, #{entity.downStatus}, #{entity.tradeTime}, #{entity.userId}, #{entity.count}, #{entity.abroad}, #{entity.recStatus}, #{entity.sceneNum}, #{entity.sceneName})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		order_sn=#{entity.orderSn}, amount=#{entity.amount}, number=#{entity.number}, pay_type=#{entity.payType}, pay_status=#{entity.payStatus}, down_status=#{entity.downStatus}, trade_time=#{entity.tradeTime}, user_id=#{entity.userId}, count=#{entity.count}, abroad=#{entity.abroad}, rec_status=#{entity.recStatus}, scene_num=#{entity.sceneNum}, scene_name=#{entity.sceneName}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 128 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/ExpansionOrderMapper.xml

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.goods.mapper.IExpansionOrderMapper">
+	<resultMap id="resultMap" type="com.fdkankan.goods.entity.ExpansionOrder">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="order_sn" jdbcType="VARCHAR" property="orderSn" />
+		<result column="amount" jdbcType="DECIMAL" property="amount" />
+		<result column="number" jdbcType="VARCHAR" property="number" />
+		<result column="pay_type" jdbcType="INTEGER" property="payType" />
+		<result column="pay_status" jdbcType="INTEGER" property="payStatus" />
+		<result column="status" jdbcType="INTEGER" property="status" />
+		<result column="trade_time" jdbcType="TIMESTAMP" property="tradeTime" />
+		<result column="user_id" jdbcType="VARCHAR" property="userId" />
+		<result column="month" jdbcType="INTEGER" property="month" />
+		<result column="years" jdbcType="INTEGER" property="years" />
+		<result column="delay" jdbcType="INTEGER" property="delay" />
+		<result column="unit_size" jdbcType="INTEGER" property="unitSize" />
+		<result column="unit" jdbcType="VARCHAR" property="unit" />
+		<result column="camera_id" jdbcType="VARCHAR" property="cameraId" />
+		<result column="abroad" jdbcType="INTEGER" property="abroad" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,order_sn,amount,number,pay_type,pay_status,status,trade_time,user_id,month,years,delay,unit_size,unit,camera_id,abroad,create_time,rec_status,update_time,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		order_sn, amount, number, pay_type, pay_status, status, trade_time, user_id, month, years, delay, unit_size, unit, camera_id, abroad, rec_status
+		) VALUES (
+		#{entity.orderSn}, #{entity.amount}, #{entity.number}, #{entity.payType}, #{entity.payStatus}, #{entity.status}, #{entity.tradeTime}, #{entity.userId}, #{entity.month}, #{entity.years}, #{entity.delay}, #{entity.unitSize}, #{entity.unit}, #{entity.cameraId}, #{entity.abroad}, #{entity.recStatus}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		order_sn, amount, number, pay_type, pay_status, status, trade_time, user_id, month, years, delay, unit_size, unit, camera_id, abroad, rec_status
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.orderSn}, #{entity.amount}, #{entity.number}, #{entity.payType}, #{entity.payStatus}, #{entity.status}, #{entity.tradeTime}, #{entity.userId}, #{entity.month}, #{entity.years}, #{entity.delay}, #{entity.unitSize}, #{entity.unit}, #{entity.cameraId}, #{entity.abroad}, #{entity.recStatus})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		order_sn=#{entity.orderSn}, amount=#{entity.amount}, number=#{entity.number}, pay_type=#{entity.payType}, pay_status=#{entity.payStatus}, status=#{entity.status}, trade_time=#{entity.tradeTime}, user_id=#{entity.userId}, month=#{entity.month}, years=#{entity.years}, delay=#{entity.delay}, unit_size=#{entity.unitSize}, unit=#{entity.unit}, camera_id=#{entity.cameraId}, abroad=#{entity.abroad}, rec_status=#{entity.recStatus}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 123 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/GoodsMapper.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.fdkankan.goods.mapper.IGoodsMapper">
+	<resultMap id="resultMap" type="com.fdkankan.goods.entity.Goods">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="good_name" jdbcType="VARCHAR" property="goodName" />
+		<result column="description" jdbcType="VARCHAR" property="description" />
+		<result column="goods_sn" jdbcType="VARCHAR" property="goodsSn" />
+		<result column="goods_status" jdbcType="VARCHAR" property="goodsStatus" />
+		<result column="image_url" jdbcType="VARCHAR" property="imageUrl" />
+		<result column="pic" jdbcType="VARCHAR" property="pic" />
+		<result column="express_price" jdbcType="DECIMAL" property="expressPrice" />
+		<result column="sort" jdbcType="INTEGER" property="sort" />
+		<result column="goods_price" jdbcType="DECIMAL" property="goodsPrice" />
+		<result column="goods_dollar_price" jdbcType="DECIMAL" property="goodsDollarPrice" />
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+		<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />
+		<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+		<result column="tb_status" jdbcType="INTEGER" property="tbStatus" />
+	</resultMap>
+	<sql id="columnList">
+id,good_name,description,goods_sn,goods_status,image_url,pic,express_price,sort,goods_price,goods_dollar_price,create_time,rec_status,update_time,tb_status	</sql>
+		<insert id="insert" useGeneratedKeys="true" keyProperty="entity.id">
+		INSERT INTO ${tableName} (
+		good_name, description, goods_sn, goods_status, image_url, pic, express_price, sort, goods_price, goods_dollar_price, rec_status
+		) VALUES (
+		#{entity.goodName}, #{entity.description}, #{entity.goodsSn}, #{entity.goodsStatus}, #{entity.imageUrl}, #{entity.pic}, #{entity.expressPrice}, #{entity.sort}, #{entity.goodsPrice}, #{entity.goodsDollarPrice}, #{entity.recStatus}
+		)	</insert>
+		<insert id="insertByBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
+		INSERT INTO ${tableName} (
+		good_name, description, goods_sn, goods_status, image_url, pic, express_price, sort, goods_price, goods_dollar_price, rec_status
+		) VALUES 
+		<foreach collection="list" item="entity" index="index" separator=",">
+			(#{entity.goodName}, #{entity.description}, #{entity.goodsSn}, #{entity.goodsStatus}, #{entity.imageUrl}, #{entity.pic}, #{entity.expressPrice}, #{entity.sort}, #{entity.goodsPrice}, #{entity.goodsDollarPrice}, #{entity.recStatus})
+		</foreach>
+	</insert>
+		<update id="update"  parameterType="java.util.List" >
+		<foreach collection="list" item="entity" index="index" separator=";">
+		UPDATE ${tableName} SET 
+		good_name=#{entity.goodName}, description=#{entity.description}, goods_sn=#{entity.goodsSn}, goods_status=#{entity.goodsStatus}, image_url=#{entity.imageUrl}, pic=#{entity.pic}, express_price=#{entity.expressPrice}, sort=#{entity.sort}, goods_price=#{entity.goodsPrice}, goods_dollar_price=#{entity.goodsDollarPrice}, rec_status=#{entity.recStatus}, tb_status=#{entity.tbStatus}
+		 WHERE 
+		id = #{entity.id}
+
+		</foreach>
+	</update>
+	<update id="updateByBatch" >
+			UPDATE ${tableName} SET
+				${field}
+			<where>
+				<foreach collection="condition" index="key" item="value">
+					${value} ${key}
+				</foreach>
+			</where>
+	</update>
+	<select id="getById" parameterType="java.lang.Integer" resultMap="resultMap">
+		select
+		<include refid="columnList" />
+		from ${tableName} 
+		where id = #{id}
+	</select>
+	<select id="getOne" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		limit 1;
+	</select>
+	<select id="getCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		select
+		count(id)
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+	</select>
+	<!-- 这部分为根据传递参数,自动生成SQL -->
+	<select id="getList" parameterType="java.util.Map" resultMap="resultMap">
+		select
+		<if test="field == null">
+			<include refid="columnList" />
+		</if>
+		<if test="field != null">
+			${field}
+		</if>
+		from ${tableName} 
+		<where>
+			<foreach collection="condition" index="key" item="value">
+				${value} ${key}
+			</foreach>
+		</where>
+		<if test="order != null">
+			order by ${order}
+		</if>
+		<if test="limit != 0">
+			<if test="offset != 0">
+				limit ${offset}, ${limit}
+			</if>
+			<if test="offset == 0">
+				limit ${limit}
+			</if>
+		</if>
+	</select>
+	<!-- 判断表格是否存在,如果不存在可以配合createTable使用,用于动态创建表格 -->
+	<select id="existTable" parameterType="String" resultType="java.lang.Integer">
+		select count(table_name) from information_schema.TABLES WHERE table_name=#{tableName} ;
+	</select>
+	<update id="createTable" parameterType="String">
+		<!-- 这里是创建表格的SQL,复制过来,表名作为参数传递 -->
+		<!-- create table ${tableName} (   //  表名要这样写 -->
+	</update>
+</mapper>

+ 0 - 0
4dkankan-center-goods/src/main/resources/mapper/goods/GoodsSkuMapper.xml


Some files were not shown because too many files changed in this diff