系统参数编码业务提交

pom.xml

@@ -19,9 +19,20 @@
     </properties>
 
     <dependencies>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.lettuce</groupId>
+                    <artifactId>lettuce-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -180,9 +191,9 @@
             <version>1.2.29</version>
         </dependency>
         <!--<dependency>-->
-            <!--<groupId>it.sauronsoftware</groupId>-->
-            <!--<artifactId>jave</artifactId>-->
-            <!--<version>1.0.2</version>-->
+        <!--<groupId>it.sauronsoftware</groupId>-->
+        <!--<artifactId>jave</artifactId>-->
+        <!--<version>1.0.2</version>-->
         <!--</dependency>-->
 
         <dependency>
@@ -198,9 +209,9 @@
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>net.sourceforge.pinyin4j</groupId>-->
-            <!--<artifactId>pinyin4j</artifactId>-->
-            <!--<version>2.5.0</version>-->
+        <!--<groupId>net.sourceforge.pinyin4j</groupId>-->
+        <!--<artifactId>pinyin4j</artifactId>-->
+        <!--<version>2.5.0</version>-->
         <!--</dependency>-->
 
         <dependency>
@@ -210,9 +221,9 @@
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>com.gexin.platform</groupId>-->
-            <!--<artifactId>gexin-rp-sdk-http</artifactId>-->
-            <!--<version>4.1.0.5</version>-->
+        <!--<groupId>com.gexin.platform</groupId>-->
+        <!--<artifactId>gexin-rp-sdk-http</artifactId>-->
+        <!--<version>4.1.0.5</version>-->
         <!--</dependency>-->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -232,13 +243,19 @@
             <artifactId>swagger-bootstrap-ui</artifactId>
             <version>1.9.6</version>
         </dependency>
+        <!--代码生成器@entity等注解标识-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
     </dependencies>
 
     <!--<repositories>-->
-        <!--<repository>-->
-            <!--<id>getui-nexus</id>-->
-            <!--<url>http://mvn.gt.igexin.com/nexus/content/repositories/releases/</url>-->
-        <!--</repository>-->
+    <!--<repository>-->
+    <!--<id>getui-nexus</id>-->
+    <!--<url>http://mvn.gt.igexin.com/nexus/content/repositories/releases/</url>-->
+    <!--</repository>-->
     <!--</repositories>-->
 
     <build>

src/main/java/com/atlgroupasia/ServicecenterApplication.java

-package com;
+package com.atlgroupasia;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -10,12 +10,11 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @SpringBootApplication
 @EnableSwagger2
 @EnableCaching
-@MapperScan(value = "com.atlgroupasia.servicecenter.mapper")
+@MapperScan(value = {"com.atlgroupasia.servicecenter.mapper", "com.atlgroupasia.servicecenter.mbg.mapper", "com.atlgroupasia.servicecenter.operation.*.dao"})
 @ComponentScan(basePackages = {"com.atlgroupasia.servicecenter.*"})
 public class ServicecenterApplication {
 
 
-
     public static void main(String[] args) {
         SpringApplication.run(ServicecenterApplication.class, args);
     }

src/main/java/com/atlgroupasia/servicecenter/mbg/mapper/OshExhibitMapper.java

+package com.atlgroupasia.servicecenter.mbg.mapper;
+
+import com.atlgroupasia.servicecenter.mbg.po.OshExhibit;
+import com.atlgroupasia.servicecenter.mbg.po.OshExhibitExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OshExhibitMapper {
+    long countByExample(OshExhibitExample example);
+
+    int deleteByExample(OshExhibitExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(OshExhibit record);
+
+    int insertSelective(OshExhibit record);
+
+    List<OshExhibit> selectByExample(OshExhibitExample example);
+
+    OshExhibit selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") OshExhibit record, @Param("example") OshExhibitExample example);
+
+    int updateByExample(@Param("record") OshExhibit record, @Param("example") OshExhibitExample example);
+
+    int updateByPrimaryKeySelective(OshExhibit record);
+
+    int updateByPrimaryKey(OshExhibit record);
+}
\ No newline at end of file

src/main/java/com/atlgroupasia/servicecenter/mbg/po/OshExhibit.java

+package com.atlgroupasia.servicecenter.mbg.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Entity
+public class OshExhibit implements Serializable {
+    @ApiModelProperty(value = "展览纪念馆id")
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    private Integer id;
+
+    @ApiModelProperty(value = "寺庙id")
+    private Integer templeId;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "参观开始时间")
+    private String joinStartTime;
+
+    @ApiModelProperty(value = "参观结束时间")
+    private String joinEndTime;
+
+    @ApiModelProperty(value = "报名开始时间")
+    private String applyStartTime;
+
+    @ApiModelProperty(value = "报名结束时间")
+    private String applyEndTime;
+
+    @ApiModelProperty(value = "最大报名人数")
+    private Integer totalNumber;
+
+    @ApiModelProperty(value = "已报名人数")
+    private Integer appNumber;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    private Integer isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getTempleId() {
+        return templeId;
+    }
+
+    public void setTempleId(Integer templeId) {
+        this.templeId = templeId;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getJoinStartTime() {
+        return joinStartTime;
+    }
+
+    public void setJoinStartTime(String joinStartTime) {
+        this.joinStartTime = joinStartTime;
+    }
+
+    public String getJoinEndTime() {
+        return joinEndTime;
+    }
+
+    public void setJoinEndTime(String joinEndTime) {
+        this.joinEndTime = joinEndTime;
+    }
+
+    public String getApplyStartTime() {
+        return applyStartTime;
+    }
+
+    public void setApplyStartTime(String applyStartTime) {
+        this.applyStartTime = applyStartTime;
+    }
+
+    public String getApplyEndTime() {
+        return applyEndTime;
+    }
+
+    public void setApplyEndTime(String applyEndTime) {
+        this.applyEndTime = applyEndTime;
+    }
+
+    public Integer getTotalNumber() {
+        return totalNumber;
+    }
+
+    public void setTotalNumber(Integer totalNumber) {
+        this.totalNumber = totalNumber;
+    }
+
+    public Integer getAppNumber() {
+        return appNumber;
+    }
+
+    public void setAppNumber(Integer appNumber) {
+        this.appNumber = appNumber;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Integer isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", templeId=").append(templeId);
+        sb.append(", phone=").append(phone);
+        sb.append(", joinStartTime=").append(joinStartTime);
+        sb.append(", joinEndTime=").append(joinEndTime);
+        sb.append(", applyStartTime=").append(applyStartTime);
+        sb.append(", applyEndTime=").append(applyEndTime);
+        sb.append(", totalNumber=").append(totalNumber);
+        sb.append(", appNumber=").append(appNumber);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

src/main/java/com/atlgroupasia/servicecenter/operation/exhibit/dao/OshExhibitDao.java

+package com.atlgroupasia.servicecenter.operation.exhibit.dao;
+
+import com.atlgroupasia.servicecenter.operation.exhibit.pojo.QueryExhibitParam;
+import com.atlgroupasia.servicecenter.operation.exhibit.pojo.QueryExhibitVO;
+
+import java.util.List;
+
+/**
+ * @Author xh
+ * @Date 2021/4/15
+ * description:
+ */
+public interface OshExhibitDao {
+
+    /**
+     * 根据其他参数查询 展示馆list
+     *
+     * @param queryExhibitParam
+     * @return
+     */
+    List<QueryExhibitVO> selectExhibitListByOther(QueryExhibitParam queryExhibitParam);
+}

src/main/java/com/atlgroupasia/servicecenter/operation/exhibit/pojo/QueryExhibitParam.java

+package com.atlgroupasia.servicecenter.operation.exhibit.pojo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author xh
+ * @Date 2021/4/15
+ * description:
+ */
+@Data
+public class QueryExhibitParam implements Serializable {
+
+    @ApiModelProperty(value = "展览纪念馆id")
+    private Integer id;
+    @ApiModelProperty(value = "寺庙id")
+    private Integer templeId;
+    @ApiModelProperty(value = "参观开始时间")
+    private String phone;
+    @ApiModelProperty(value = "参观开始时间")
+    private String joinStartTime;
+    @ApiModelProperty(value = "参观结束时间")
+    private String joinEndTime;
+    @ApiModelProperty(value = "报名开始时间")
+    private String applyStartTime;
+    @ApiModelProperty(value = "报名结束时间")
+    private String applyEndTime;
+    @ApiModelProperty(value = "最大报名人数")
+    private Integer totalNumber;
+    @ApiModelProperty(value = "已报名人数")
+    private Integer appNumber;
+
+    @ApiModelProperty(value = "寺庙名称")
+    private String templeName;
+
+
+}

src/main/java/com/atlgroupasia/servicecenter/operation/exhibit/pojo/QueryExhibitVO.java

+package com.atlgroupasia.servicecenter.operation.exhibit.pojo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author xh
+ * @Date 2021/4/15
+ * description:
+ */
+@Data
+public class QueryExhibitVO implements Serializable {
+
+
+
+}

src/main/java/com/atlgroupasia/servicecenter/operation/exhibit/service/IOshExhibitService.java

+package com.atlgroupasia.servicecenter.operation.exhibit.service;
+
+/**
+ * @Author xh
+ * @Date 2021/4/15
+ * description:
+ */
+public interface IOshExhibitService {
+}

src/main/java/com/atlgroupasia/servicecenter/operation/exhibit/service/impl/OshExhibitServiceImpl.java

+package com.atlgroupasia.servicecenter.operation.exhibit.service.impl;
+
+import com.atlgroupasia.servicecenter.mbg.mapper.OshExhibitMapper;
+import com.atlgroupasia.servicecenter.operation.exhibit.dao.OshExhibitDao;
+import com.atlgroupasia.servicecenter.operation.exhibit.service.IOshExhibitService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author xh
+ * @Date 2021/4/15
+ * description:
+ */
+@Service
+public class OshExhibitServiceImpl implements IOshExhibitService {
+
+    @Resource
+    private OshExhibitMapper oshExhibitMapper;
+    @Resource
+    private OshExhibitDao oshExhibitDao;
+
+
+}

src/main/resources/application.yml

@@ -10,9 +10,14 @@ spring:
   #���ݿ�����
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://lmerp001w.mysql.rds.aliyuncs.com/lmerp?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: test_erp
-    password: Fzii591com
+    #url: jdbc:mysql://lmerp001w.mysql.rds.aliyuncs.com/lmerp?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    #username: test_erp
+    #password: Fzii591com
+
+    url: jdbc:mysql://47.98.216.76:3306/atl-service-center?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    username: root
+    password: 6just@2019
+
     type: com.alibaba.druid.pool.DruidDataSource
 
 
@@ -29,10 +34,12 @@ spring:
     database: 0
     # Redis服务器地址
     host: 47.98.96.174
+    #host: 127.0.0.1
     # Redis服务器连接端口
     port: 6379
     # Redis服务器连接密码（默认为空）
     password: "root123!!"
+    #password: ""
     #password: atl@redis_120726
     jedis:
       pool:
@@ -53,7 +60,7 @@ server:
 #����myba
 #配置mybatis
 mybatis:
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: classpath:mapper/**/*.xml
   #全局的映射，不用在xml文件写实体类的全路径
   type-aliases-package: com.atlgroupasia.servicecenter
   #开启驼峰映射

src/main/resources/mapper/operation/exhibit/OshExhibitDao.xml

+<?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.atlgroupasia.servicecenter.operation.exhibit.dao.OshExhibitDao">
+    <resultMap id="baseResultMap" type="com.atlgroupasia.servicecenter.mbg.po.OshExhibit" extends="com.atlgroupasia.servicecenter.mbg.mapper.OshExhibitMapper.BaseResultMap">
+
+    </resultMap>
+
+    <select id="selectExhibitListByOther" parameterType="com.atlgroupasia.servicecenter.operation.exhibit.pojo.QueryExhibitParam" resultType="com.atlgroupasia.servicecenter.operation.exhibit.pojo.QueryExhibitVO">
+        select
+                a.id,a.temple_id templeId
+        from osh_exhibit a
+        left join mis_temple b ON a.temple_id = b.id
+    </select>
+
+</mapper>
\ No newline at end of file