后端修改-王通通

pom.xml

@@ -25,6 +25,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <version>3.1.3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/yeejoin/amos/api/tool/controller/AmosToolTemplateController.java

@@ -39,9 +39,9 @@ public class AmosToolTemplateController {
     @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
     @PostMapping("/select/all")
     @ApiOperation(value = "查询大全")
-    public ResponseModel<List<AmosToolTemplateModel>> query(@RequestParam(value = "templateScene") String templateScene,
+    public ResponseModel<List<AmosToolTemplateModel>> query(@RequestParam(value = "categoryScene") String categoryScene,
                                                             @RequestParam(value = "miniSences") String miniSences) {
-        return ResponseHelper.buildResponse(amosToolTemplateService.query(templateScene, miniSences));
+        return ResponseHelper.buildResponse(amosToolTemplateService.query(categoryScene, miniSences));
     }
 
     /**

src/main/java/com/yeejoin/amos/api/tool/enums/SortType.java

 package com.yeejoin.amos.api.tool.enums;
 
 public enum SortType {
-    COMPREHENSIVE("综合排序", "templateId", "asc"),
-    LATEST("最新发布", "releaseTime", "desc"),
-    VIEW_TIMES("最多浏览", "viewTimes", "desc");
+    COMPREHENSIVE("综合排序", "TEMPLATE_ID", "asc"),
+    LATEST("最新发布", "REC_DATE", "desc"),
+    VIEW_TIMES("最多浏览", "VIEW_TIMES", "desc");
 
     private final String name;
     private final String field;

src/main/java/com/yeejoin/amos/api/tool/face/model/AmosToolTemplateModel.java

@@ -4,7 +4,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-import java.sql.Timestamp;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -32,11 +31,7 @@ public class AmosToolTemplateModel extends BaseModel {
     /**
      * 模板URL
      */
-    private String templateUrl;
-    /**
-     * 发布时间
-     */
-    private Timestamp releaseTime;
+    private String templateLink;
     /**
      * 是否删除
      */

src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/AmosToolTemplateMapper.java

@@ -3,34 +3,38 @@ package com.yeejoin.amos.api.tool.face.orm.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.api.tool.face.model.AmosToolTemplateModel;
 import com.yeejoin.amos.api.tool.face.orm.entity.AmosToolTemplate;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
-
+@Mapper
 public interface AmosToolTemplateMapper extends BaseMapper<AmosToolTemplate> {
     /**
      * 全部
      */
-    @Select("select templateUrl,templateName,agencyName,viewTimes,releaseTime from amos_tool_template" +
+    @Select("select TEMPLATE_NAME,AGENCY_NAME,VIEW_TIMES,TEMPLATE_LINK,REC_DATE from amos_tool_template" +
             " order by ${miniSences} ${way}")
     List<AmosToolTemplateModel> listAll(@Param("miniSences") String miniSences,
                                         @Param("way") String way);
     /**
      * 具体场景
      */
-    @Select("select templateUrl,templateName,agencyName,viewTimes,releaseTime from amos_tool_template" +
-            " where categoryScene=#{categoryScene} order by ${miniSences} ${way}")
+    @Select("select TEMPLATE_NAME,AGENCY_NAME,VIEW_TIMES,TEMPLATE_LINK,REC_DATE from amos_tool_template" +
+            " where CATEGORY_SCENE=#{categoryScene} order by `${miniSences}` ${way}")
     List<AmosToolTemplateModel> queryByScenes(@Param("categoryScene") String categoryScene,
                                               @Param("miniSences") String miniSences, @Param("way") String way);
-    @Select("select templateId,templateName,categoryScene,agencyName,viewTimes,templateUrl,releaseTime" +
+    /**
+     * 列表展示
+     */
+    @Select("select TEMPLATE_ID,TEMPLATE_NAME,CATEGORY_SCENE,AGENCY_NAME,VIEW_TIMES,TEMPLATE_LINK,REC_DATE" +
             " from amos_tool_template")
-    List<AmosToolTemplateModel> listAll();
+    List<AmosToolTemplateModel> listData();
     /**
      * 更新查看次数
      */
-    @Update("update amos_tool_template set viewTimes = viewTimes+1 where templateId = #{templateId}")
+    @Update("update amos_tool_template set VIEW_TIMES = VIEW_TIMES+1 where TEMPLATE_ID = #{templateId}")
     boolean updateById(Long templateId);
 }

src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/AmosToolTemplate.java

@@ -46,13 +46,8 @@ public class AmosToolTemplate extends BaseEntity {
     /**
      * 模板URL
      */
-    @TableField("TEMPLATE_URL")
-    private String templateUrl;
-    /**
-     * 发布时间
-     */
-    @TableField("RELEASE_TIME")
-    private Timestamp releaseTime;
+    @TableField("TEMPLATE_LINK")
+    private String templateLink;
     /**
      * 是否删除
      */

src/main/java/com/yeejoin/amos/api/tool/face/service/AmosToolTemplateService.java

@@ -20,7 +20,7 @@ public class AmosToolTemplateService extends BaseService<AmosToolTemplateModel,
      * 查询所有
      */
     public List<AmosToolTemplateModel> queryEvery() {
-        return amosToolTemplateMapper.listAll();
+        return amosToolTemplateMapper.listData();
     }
 
     /**
@@ -33,15 +33,15 @@ public class AmosToolTemplateService extends BaseService<AmosToolTemplateModel,
     /**
      * 获取排序类型
      */
-    private SortType getSortType(String miniScenes) {
-        return SortType.fromName(miniScenes);
+    private SortType getSortType(String miniSences) {
+        return SortType.fromName(miniSences);
     }
 
     /**
      * 统一处理
      */
-    public List<AmosToolTemplateModel> query(String categoryScene, String miniScenes) {
-        SortType sortType = getSortType(miniScenes);
+    public List<AmosToolTemplateModel> query(String categoryScene, String miniSences) {
+        SortType sortType = getSortType(miniSences);
 
         if ("全部".equals(categoryScene)) {
             return amosToolTemplateMapper.listAll(sortType.getField(), sortType.getDirection());

src/main/resources/application-dev.properties

 #DB properties:
 # jdbc_config
-spring.datasource.url=jdbc:mysql://39.98.45.134:3306/amos_tool_library_test?allowMultiQueries=true
+#spring.datasource.url=jdbc:mysql://39.98.45.134:3306/amos_tool_library_test?allowMultiQueries=true
+spring.datasource.url=jdbc:mysql://39.98.45.134:3306/amos_idx_biz?allowMultiQueries=true
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

src/main/resources/application.properties

@@ -11,6 +11,7 @@ spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml
 #mybatis-plus\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B9\uFFFD\uFFFDmybatis\uFFFD\u0123\uFFFD\uFFFD\uFFFD\uFFFD\u04B2\uFFFD\uFFFD\uFFFD
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus.configuration.map-underscore-to-camel-case=true
 
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.minimum-idle=10