场景展示优化

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

 package com.yeejoin.amos.api.tool.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.api.tool.face.model.AmosToolTemplateModel;
 import com.yeejoin.amos.api.tool.face.service.AmosToolTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.doc.TycloudResource;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 
+@CrossOrigin
 @RestController
-@TycloudResource(module = "iot", value = "amosToolTemplate")
-@RequestMapping(value = "/v1/iot/AmosToolTemplate")
-@Api(tags = "丝袜哥测试")
+@RequestMapping(value = "/scene")
+@Api(tags = "场景展示Api")
 public class AmosToolTemplateController {
-    private final Logger logger = LogManager.getLogger(AmosToolTemplateController.class);
 
     @Resource
     private AmosToolTemplateService amosToolTemplateService;
 
+    /**
+     * 添加单个记录
+     */
     @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
     @PostMapping("/save")
     @ApiOperation(value = "新增", notes = "新增")
-    public ResponseModel<AmosToolTemplateModel> saveOne(@RequestBody AmosToolTemplateModel amosToolTemplateModel) {
-        amosToolTemplateModel = amosToolTemplateService.createWithModel(amosToolTemplateModel);
-        return ResponseHelper.buildResponse(amosToolTemplateModel);
+    public ResponseModel<AmosToolTemplateModel> create(@RequestBody AmosToolTemplateModel model) {
+        model = amosToolTemplateService.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据 sequenceNbr 删除
+     */
+    @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
+    @DeleteMapping("/{sequenceNbr}")
+    @ApiOperation(value = "删除")
+    public ResponseModel<Boolean> deleteById(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(amosToolTemplateService.deleteBySeq(sequenceNbr));
+    }
+
+    /**
+     * 根据 sequenceNbr 批量删除
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @DeleteMapping(value = "/delete/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr批量删除", notes = "根据sequenceNbr批量删除")
+    public ResponseModel<Boolean> deleteModelsBySequenceNbr(@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+        return ResponseHelper.buildResponse(amosToolTemplateService.removeByIds(Arrays.asList(StringUtil.string2Array(sequenceNbr))));
+    }
+
+    /**
+     * 根据 sequenceNbr 编辑单个记录
+     */
+    @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
+    @ApiOperation(value = "编辑")
+    @RequestMapping(value = "/{sequenceNbr}", method = RequestMethod.PUT)
+    public ResponseModel<AmosToolTemplateModel> update(
+            @RequestBody AmosToolTemplateModel model,
+            @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(amosToolTemplateService.updateWithModel(model));
+    }
+
+    /**
+     * 根据 sequenceNbr 查询单个记录
+     */
+    @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
+    @ApiOperation(value = "查询单个对象")
+    @RequestMapping(value = "/{sequenceNbr}", method = RequestMethod.GET)
+    public ResponseModel<AmosToolTemplateModel> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(amosToolTemplateService.queryBySeq(sequenceNbr));
     }
 
     /**
      * 根据字段查询
      */
     @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
-    @PostMapping("/select/all")
     @ApiOperation(value = "查询大全")
+    @PostMapping("/select/all")
     public ResponseModel<List<AmosToolTemplateModel>> query(@RequestParam(value = "categoryScene") String categoryScene,
                                                             @RequestParam(value = "miniSences") String miniSences) {
         return ResponseHelper.buildResponse(amosToolTemplateService.query(categoryScene, miniSences));
     }
 
     /**
-     * 查询所有
+     * 列表所有记录
      */
     @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
-    @PostMapping("/every")
     @ApiOperation("查询所有")
-    public ResponseModel<List<AmosToolTemplateModel>> queryEvery() {
-        return ResponseHelper.buildResponse(amosToolTemplateService.queryEvery());
+    @PostMapping("/every")
+    public ResponseModel<List<AmosToolTemplateModel>> selectForList() {
+        return ResponseHelper.buildResponse(amosToolTemplateService.queryList());
     }
 
     /**
-     * 根据ID删除
+     * 列表分页查询
      */
     @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
-    @DeleteMapping("/delete")
-    @ApiOperation(value = "删除")
-    public ResponseModel<Boolean> deleteById(@RequestParam(value = "templateId") Long templateId) {
-        return ResponseHelper.buildResponse(amosToolTemplateService.deleteBySeq(templateId));
+    @ApiOperation(value = "分页查询")
+    @GetMapping(value = "/page")
+    public ResponseModel<Page<AmosToolTemplateModel>> queryForPage(
+            @RequestParam(value = "current") int current,
+            @RequestParam(value = "size") int size) {
+        Page page = new Page();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(amosToolTemplateService.queryForAmosToolPage(page));
     }
 
     /**
-     * 根据ID更新
+     * 点击后根据 sequenceNbr 查看次数加一
      */
     @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
+    @ApiOperation(value = "点击查看次数加一")
     @PutMapping("/update")
-    @ApiOperation(value = "更新")
-    public ResponseModel<Boolean> updateById(@RequestParam(value = "templateId") Long templateId) {
-        return ResponseHelper.buildResponse(amosToolTemplateService.updateTimes(templateId));
+    public ResponseModel<Boolean> updateById(@RequestParam(value = "templateId") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(amosToolTemplateService.updateTimes(sequenceNbr));
     }
 }

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

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

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

@@ -8,10 +8,7 @@ import org.typroject.tyboot.core.rdbms.model.BaseModel;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class AmosToolTemplateModel extends BaseModel {
-    /**
-     * 模板ID
-     */
-    private Long templateId;
+
     /**
      * 模板名称
      */
@@ -19,7 +16,7 @@ public class AmosToolTemplateModel extends BaseModel {
     /**
      * 场景类型
      */
-    private String templateScene;
+    private String categoryScene;
     /**
      * 所属机构
      */

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

@@ -7,7 +7,6 @@ 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
@@ -15,26 +14,23 @@ public interface AmosToolTemplateMapper extends BaseMapper<AmosToolTemplate> {
     /**
      * 全部
      */
-    @Select("select TEMPLATE_NAME,AGENCY_NAME,VIEW_TIMES,TEMPLATE_LINK,REC_DATE from amos_tool_template" +
+    @Select("select * from amos_tool_template" +
             " order by ${miniSences} ${way}")
     List<AmosToolTemplateModel> listAll(@Param("miniSences") String miniSences,
                                         @Param("way") String way);
+
     /**
      * 具体场景
      */
-    @Select("select TEMPLATE_NAME,AGENCY_NAME,VIEW_TIMES,TEMPLATE_LINK,REC_DATE from amos_tool_template" +
+    @Select("select * 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 TEMPLATE_ID,TEMPLATE_NAME,CATEGORY_SCENE,AGENCY_NAME,VIEW_TIMES,TEMPLATE_LINK,REC_DATE" +
-            " from amos_tool_template")
-    List<AmosToolTemplateModel> listData();
-    /**
-     * 更新查看次数
+     * 点击查看次数加一
      */
-    @Update("update amos_tool_template set VIEW_TIMES = VIEW_TIMES+1 where TEMPLATE_ID = #{templateId}")
-    boolean updateById(Long templateId);
+    @Update("update amos_tool_template set VIEW_TIMES = VIEW_TIMES+1 where SEQUENCE_NBR = #{sequenceNbr}")
+    boolean updateTimesById(@Param("sequenceNbr") Long sequenceNbr);
 }

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

@@ -8,7 +8,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
-import java.sql.Timestamp;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -16,14 +15,6 @@ import java.sql.Timestamp;
 public class AmosToolTemplate extends BaseEntity {
 
     /**
-     * 模板ID
-     */
-    @TableId(
-            value = "TEMPLATE_ID",
-            type = IdType.ID_WORKER
-    )
-    protected Long templateId;
-    /**
      * 模板名称
      */
     @TableField("TEMPLATE_NAME")

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

 package com.yeejoin.amos.api.tool.face.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.api.tool.enums.SortType;
 import com.yeejoin.amos.api.tool.face.model.AmosToolTemplateModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.AmosToolTemplateMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.AmosToolTemplate;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import javax.annotation.Resource;
 import java.util.List;
 
@@ -16,18 +16,12 @@ public class AmosToolTemplateService extends BaseService<AmosToolTemplateModel,
     @Resource
     private AmosToolTemplateMapper amosToolTemplateMapper;
 
-    /**
-     * 查询所有
-     */
-    public List<AmosToolTemplateModel> queryEvery() {
-        return amosToolTemplateMapper.listData();
-    }
 
     /**
-     * 查看次数更新
+     * 点击后查看次数加一
      */
-    public boolean updateTimes(Long templateId) {
-        return amosToolTemplateMapper.updateById(templateId);
+    public boolean updateTimes(Long sequenceNbr) {
+        return amosToolTemplateMapper.updateTimesById(sequenceNbr);
     }
 
     /**
@@ -38,6 +32,21 @@ public class AmosToolTemplateService extends BaseService<AmosToolTemplateModel,
     }
 
     /**
+     * 列表全部数据
+     */
+
+    public List<AmosToolTemplateModel> queryList(){
+        return this.queryForList("" , false);
+    }
+
+    /**
+     * 列表分页查询
+     */
+    public Page<AmosToolTemplateModel> queryForAmosToolPage(Page page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
      * 统一处理
      */
     public List<AmosToolTemplateModel> query(String categoryScene, String miniSences) {