设备模块、类别模块代码更新

system/src/main/java/com/canvas/web/modules/device/criteria/DeviceQueryCriteria.java

@@ -1,16 +1,26 @@
 package com.canvas.web.modules.device.criteria;
 
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.canvas.web.annotation.Query;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
 public class DeviceQueryCriteria {
 
     @Query
+    @JSONField(name="device_id")
+    @JsonProperty("device_id")
     private String deviceId;
+
     @Query
+    @JSONField(name="device_name")
+    @JsonProperty("device_name")
     private String deviceName;
+
     @Query
+    @JSONField(name="is_state")
+    @JsonProperty("is_state")
     private Integer isState;
 }

system/src/main/java/com/canvas/web/modules/device/domain/Device.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.UpdateTimestamp;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.sql.Time;
 import java.sql.Timestamp;
 
 @Getter
@@ -50,7 +51,7 @@ public class Device extends BaseEntity implements Serializable {
 
     @Column(name = "open_time")
     @ApiModelProperty(value = "开机时间")
-    public Timestamp openTime;
+    public Time openTime;
 
     @Column(name = "close_setting")
     @ApiModelProperty(value = "关机设置  1.每天  2.每周")
@@ -62,7 +63,7 @@ public class Device extends BaseEntity implements Serializable {
 
     @Column(name = "close_time")
     @ApiModelProperty(value = "关机时间")
-    public Timestamp closeTime;
+    public Time closeTime;
 
     @Column(name = "startup_screen")
     @ApiModelProperty(value = "启动画面地址")

system/src/main/java/com/canvas/web/modules/device/dto/DeviceDTO.java

@@ -1,5 +1,7 @@
 package com.canvas.web.modules.device.dto;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,8 +10,24 @@ import java.io.Serializable;
 @Getter
 @Setter
 public class DeviceDTO implements Serializable {
+
+    @JSONField(name="device_id")
+    @JsonProperty("device_id")
     public String deviceId;
+
+    @JSONField(name="account")
+    @JsonProperty("account")
     public String account;
+
+    @JSONField(name="device_name")
+    @JsonProperty("device_name")
     public String deviceName;
+
+    @JSONField(name="device_direction")
+    @JsonProperty("device_direction")
     public Integer deviceDirection;
+
+    @JSONField(name="orga_id")
+    @JsonProperty("orga_id")
+    private String orgaId;
 }

system/src/main/java/com/canvas/web/modules/device/repository/DeviceRepository.java

@@ -14,7 +14,7 @@ public interface DeviceRepository extends JpaRepository<Device, String> {
             value="select d.id as deviceId,d.account deviceAccount,d.device_name as deviceName,d.device_direction as deviceDirection," +
                     "o.name as organName,d.open_setting as openSetting,d.open_weekly as openWeekly,d.open_time as openTime," +
                     "d.close_setting as closeSetting,d.close_weekly as closeWeekly,d.close_time as closeTime," +
-                    "d.startup_screen as startupScreen,d.is_state as deviceState,d.is_createdate as createTime " +
+                    "d.startup_screen as startupScreen,d.is_state as deviceState,d.create_time as createTime " +
                     "from device d left join organization o on d.orga_id = o.id " +
                     "where if(?1 is null,1=1,d.id like %?1%) and if(?2 is null,1=1,d.device_name like %?2%) " +
                     "and if(?3 is null,1=1,d.is_state = ?3)")

system/src/main/java/com/canvas/web/modules/device/rest/DeviceController.java

@@ -1,5 +1,7 @@
 package com.canvas.web.modules.device.rest;
 
+import com.canvas.web.annotation.rest.AnonymousGetMapping;
+import com.canvas.web.annotation.rest.AnonymousPostMapping;
 import com.canvas.web.modules.device.criteria.DeviceQueryCriteria;
 import com.canvas.web.modules.device.criteria.DeviceSettingCriteria;
 import com.canvas.web.modules.device.domain.Device;
@@ -24,10 +26,11 @@ import java.util.List;
 @RequestMapping("/api/device")
 public class DeviceController {
 
-    DeviceService deviceService;
+    private final DeviceService deviceService;
 
     @ApiOperation("设备列表")
-    @GetMapping("/list")
+//    @GetMapping("/list")
+    @AnonymousGetMapping("/list")
     public Response<ResultUtils<List<DeviceVO>>> list(
             DeviceQueryCriteria criteria, Pageable page
     ){
@@ -35,7 +38,8 @@ public class DeviceController {
     }
 
     @ApiOperation("编辑设备")
-    @PostMapping("/save")
+//    @PostMapping("/save")
+    @AnonymousPostMapping("/save")
     public Response<Object> save(
             @Validated @RequestBody DeviceDTO dto
     ){
@@ -44,7 +48,8 @@ public class DeviceController {
     }
 
     @ApiOperation("根据id查询设备")
-    @GetMapping("/findById")
+//    @GetMapping("/findById")
+    @AnonymousGetMapping("/findById")
     public Response<Device> findById(
             String deviceId
     ){
@@ -52,7 +57,8 @@ public class DeviceController {
     }
 
     @ApiOperation("设备开关机列表")
-    @GetMapping("/switchlist")
+//    @GetMapping("/switchlist")
+    @AnonymousGetMapping("/switchlist")
     public Response<ResultUtils<List<DeviceVO>>> switchlist(
             DeviceQueryCriteria criteria, Pageable page
     ){
@@ -60,7 +66,8 @@ public class DeviceController {
     }
 
     @ApiOperation("开关机配置")
-    @PostMapping("/switchSetting")
+//    @PostMapping("/switchSetting")
+    @AnonymousPostMapping("/switchSetting")
     public Response<Object> switchSetting(
             DeviceSettingCriteria criteria
     ){
@@ -69,7 +76,8 @@ public class DeviceController {
     }
 
     @ApiOperation("更新设备状态")
-    @PostMapping("/updateState")
+//    @PostMapping("/updateState")
+    @AnonymousPostMapping("/updateState")
     public Response<Object> updateState(
             String deviceId,Integer state
     ){

system/src/main/java/com/canvas/web/modules/device/service/impl/DeviceServiceImpl.java

@@ -16,7 +16,9 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
@@ -40,6 +42,7 @@ public class DeviceServiceImpl implements DeviceService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean edit(DeviceDTO dto) {
         boolean isok = true;
         try {
@@ -50,10 +53,13 @@ public class DeviceServiceImpl implements DeviceService {
             }else{
                 device.setCreateTime(new Timestamp(new Date().getTime()));
                 device.setUpdateTime(new Timestamp(new Date().getTime()));
+                device.setIsDel(false);
+                device.setIsState(1);
             }
             device.setAccount(dto.getAccount());
             device.setDeviceName(dto.getDeviceName());
             device.setDeviceDirection(dto.getDeviceDirection());
+            device.setOrgaId(dto.getOrgaId());
             device = deviceRepository.saveAndFlush(device);
         }catch (Exception e){
             isok = false;
@@ -63,14 +69,15 @@ public class DeviceServiceImpl implements DeviceService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void setting(DeviceSettingCriteria criteria) {
         Device device = deviceRepository.findById(criteria.getDeviceId()).get();
         device.setOpenSetting(criteria.getOpenSetting());
         device.setOpenWeekly(criteria.getOpenWeekly());
-        device.setOpenTime(Timestamp.valueOf(criteria.getOpenTime()));
+        device.setOpenTime(Time.valueOf(criteria.getOpenTime()));
         device.setCloseSetting(criteria.getCloseSetting());
         device.setCloseWeekly(criteria.getCloseWeekly());
-        device.setCloseTime(Timestamp.valueOf(criteria.getCloseTime()));
+        device.setCloseTime(Time.valueOf(criteria.getCloseTime()));
         device.setStartupScreen(criteria.getStartupScreen());
         device.setUpdateTime(new Timestamp(new Date().getTime()));
         deviceRepository.saveAndFlush(device);
@@ -86,6 +93,7 @@ public class DeviceServiceImpl implements DeviceService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateState(String deviceId, Integer state) {
         Device device = deviceRepository.findById(deviceId).get();
         device.setIsState(state);

system/src/main/java/com/canvas/web/modules/device/vo/DeviceVO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.sql.Time;
 import java.sql.Timestamp;
 
 @Getter
@@ -24,13 +25,13 @@ public class DeviceVO {
     @ApiModelProperty(value = "开机每周")
     private String openWeekly;
     @ApiModelProperty(value = "开机时间")
-    private Timestamp openTime;
+    private Time openTime;
     @ApiModelProperty(value = "关机设置")
     private Integer closeSetting;
     @ApiModelProperty(value = "关机每周")
     private String closeWeekly;
     @ApiModelProperty(value = "关机时间")
-    private Timestamp closeTime;
+    private Time closeTime;
     @ApiModelProperty(value = "启动动画")
     private String startupScreen;
 }

system/src/main/java/com/canvas/web/modules/material/dto/ThemeClassDTO.java

@@ -1,5 +1,7 @@
 package com.canvas.web.modules.material.dto;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,8 +10,20 @@ import java.util.List;
 @Getter
 @Setter
 public class ThemeClassDTO {
+
+    @JsonProperty("id")
+    @JSONField(name="id")
     private String id;
+
+    @JsonProperty("class_name")
+    @JSONField(name="class_name")
     private String className;
+
+    @JsonProperty("is_all")
+    @JSONField(name="is_all")
     private Boolean isAll;
+
+    @JsonProperty("orga_ids")
+    @JSONField(name="orga_ids")
     private List<String> orgaIds;
 }

system/src/main/java/com/canvas/web/modules/material/rest/MaterialController.java

@@ -1,5 +1,7 @@
 package com.canvas.web.modules.material.rest;
 
+import com.canvas.web.annotation.rest.AnonymousGetMapping;
+import com.canvas.web.annotation.rest.AnonymousPostMapping;
 import com.canvas.web.modules.material.criteria.MaterialQueryCriteria;
 import com.canvas.web.modules.material.criteria.ThemeQueryCriteria;
 import com.canvas.web.modules.material.dto.FolderDTO;
@@ -29,7 +31,8 @@ public class MaterialController {
     private final MaterialService materialService;
 
     @ApiOperation("编辑主题/素材")
-    @PostMapping("/save")
+//    @PostMapping("/save")
+    @AnonymousPostMapping("/save")
     public Response<Object> save(
         @Validated @RequestBody MaterialDTO dto
     ){
@@ -38,7 +41,8 @@ public class MaterialController {
     }
 
     @ApiOperation("主题库素材历史列表")
-    @GetMapping("/getThemeHistoryList")
+//    @GetMapping("/getThemeHistoryList")
+    @AnonymousGetMapping("/getThemeHistoryList")
     public Response<ResultUtils<List<ThemeVO>>> getThemeHistoryList(
             ThemeQueryCriteria criteria, Pageable page
     ){
@@ -46,7 +50,8 @@ public class MaterialController {
     }
 
     @ApiOperation("主题库素材历史列表")
-    @GetMapping("/getThemeLibrary")
+//    @GetMapping("/getThemeLibrary")
+    @AnonymousGetMapping("/getThemeLibrary")
     public Response<ResultUtils<List<ThemeVO>>> getThemeLibrary(
             ThemeQueryCriteria criteria, Pageable page
     ){
@@ -54,7 +59,8 @@ public class MaterialController {
     }
 
     @ApiOperation("我的画布")
-    @PostMapping("/myAlbum")
+//    @PostMapping("/myAlbum")
+    @AnonymousPostMapping("/myAlbum")
     public Response<AlbumVO> myAlbum(
             ThemeQueryCriteria criteria, Pageable page
     ){
@@ -65,7 +71,8 @@ public class MaterialController {
     }
 
     @ApiOperation("编辑文件夹-主题库")
-    @PostMapping("/saveThemeFolder")
+//    @PostMapping("/saveThemeFolder")
+    @AnonymousPostMapping("/saveThemeFolder")
     public Response<Object> saveThemeFolder(
         @Validated @RequestBody FolderDTO dto
     ){
@@ -74,7 +81,8 @@ public class MaterialController {
     }
 
     @ApiOperation("添加到画册-主题库")
-    @PostMapping("/addMyAlbum")
+//    @PostMapping("/addMyAlbum")
+    @AnonymousPostMapping("/addMyAlbum")
     public Response<Object> addMyAlbum(
             String tfId,String themeId,String orgaId
     ){
@@ -83,7 +91,8 @@ public class MaterialController {
     }
 
     @ApiOperation("删除我的画册主题素材")
-    @PostMapping("/deleteMyAlbum")
+//    @PostMapping("/deleteMyAlbum")
+    @AnonymousPostMapping("/deleteMyAlbum")
     public Response<Object> deleteMyAlbum(
             String id
     ){
@@ -92,7 +101,8 @@ public class MaterialController {
     }
 
     @ApiOperation("删除文件夹-主题库")
-    @PostMapping("/deleteThemeFolder")
+//    @PostMapping("/deleteThemeFolder")
+    @AnonymousPostMapping("/deleteThemeFolder")
     public Response<Object> deleteThemeFolder(
             String id
     ){
@@ -101,7 +111,8 @@ public class MaterialController {
     }
 
     @ApiOperation("编辑文件夹-素材库")
-    @PostMapping("/saveMaterialFolder")
+//    @PostMapping("/saveMaterialFolder")
+    @AnonymousPostMapping("/saveMaterialFolder")
     public Response<Object> saveMaterialFolder(
             @Validated @RequestBody FolderDTO dto
     ){
@@ -110,7 +121,8 @@ public class MaterialController {
     }
 
     @ApiOperation("删除文件夹-素材库")
-    @PostMapping("/deleteMaterialFolder")
+//    @PostMapping("/deleteMaterialFolder")
+    @AnonymousPostMapping("/deleteMaterialFolder")
     public Response<Object> deleteMaterialFolder(
             String id
     ){
@@ -119,7 +131,8 @@ public class MaterialController {
     }
 
     @ApiOperation("我的素材")
-    @PostMapping("/myMaterial")
+//    @PostMapping("/myMaterial")
+    @AnonymousPostMapping("/myMaterial")
     public Response<MyMaterialVO> myMaterial(
             MaterialQueryCriteria criteria, Pageable page
     ){
@@ -130,7 +143,8 @@ public class MaterialController {
     }
 
     @ApiOperation("移动素材-素材库")
-    @PostMapping("/moveMyMaterial")
+//    @PostMapping("/moveMyMaterial")
+    @AnonymousPostMapping("/moveMyMaterial")
     public Response<Object> moveMyMaterial(
             String mifId,String folderId,String materialId
     ){
@@ -139,7 +153,8 @@ public class MaterialController {
     }
 
     @ApiOperation("移动素材-素材库")
-    @PostMapping("/deleteMyMaterial")
+//    @PostMapping("/deleteMyMaterial")
+    @AnonymousPostMapping("/deleteMyMaterial")
     public Response<Object> deleteMyMaterial(
             String materialId
     ){

system/src/main/java/com/canvas/web/modules/material/rest/ThemeClassController.java

@@ -1,9 +1,13 @@
 package com.canvas.web.modules.material.rest;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.canvas.web.annotation.rest.AnonymousGetMapping;
+import com.canvas.web.annotation.rest.AnonymousPostMapping;
 import com.canvas.web.modules.material.dto.ThemeClassDTO;
 import com.canvas.web.modules.material.service.ThemeClassService;
 import com.canvas.web.utils.Response;
 import com.canvas.web.enums.ResponseEnum;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -16,13 +20,14 @@ import java.util.Map;
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "主题分类管理")
-@RequestMapping("/api/themeClass")
+@RequestMapping("/api/themeclass")
 public class ThemeClassController {
 
-    ThemeClassService themeClassService;
+    private final ThemeClassService themeClassService;
 
     @ApiOperation("编辑分类")
-    @PostMapping("/save")
+//    @PostMapping("/save")
+    @AnonymousPostMapping("/save")
     public Response<Object> save(
             @Validated @RequestBody ThemeClassDTO dto
     ){
@@ -31,9 +36,10 @@ public class ThemeClassController {
     }
 
     @ApiOperation("根据机构id查询主题列表")
-    @GetMapping("/getThemeList")
+//    @GetMapping("/getThemeList")
+    @AnonymousGetMapping("/get_theme_list")
     public Response<List<Map<String,Object>>> getTheme(
-            String orgaId
+            @Validated @RequestBody @JsonProperty("orga_id") @JSONField(name="orga_id") String orgaId
     ){
         return Response.success(themeClassService.getTheme(orgaId));
     }

system/src/main/java/com/canvas/web/modules/material/service/impl/MaterialServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -36,6 +37,7 @@ public class MaterialServiceImpl implements MaterialService {
     MaterialInFolderRepository materialInFolderRepository;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void edit(MaterialDTO dto) {
         Material material = new Material();
         //修改
@@ -109,6 +111,7 @@ public class MaterialServiceImpl implements MaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<ThemeFolder> getAlbumFolder(String orgaId, String folderId, Integer pageNum) {
         //当页面为1时  则为画布初始化
         if(pageNum == 1){
@@ -126,6 +129,7 @@ public class MaterialServiceImpl implements MaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<MaterialFolder> getMaterialFolder(String orgaId, String folderId, Integer pageNum) {
         //当页面为1时  则为素材库初始化
         if(pageNum == 1){
@@ -156,10 +160,12 @@ public class MaterialServiceImpl implements MaterialService {
         PageRequest page= PageSort.pageRequest(pageable.getPageNumber(), pageable.getPageSize(), "create_time", Sort.Direction.DESC);
         folderId = folderId != null ? folderId : materialFolderRepository.findFirstByOrgaIdAndFidIsNull(orgaId).getId();
         Page<Map<String,Object>> pageMap = materialRepository.getMyMaterial(folderId,materialName,materialType,page);
-        return null;
+        List<ThemeVO> themeVOList = MapUtil.setList(pageMap.getContent(),ThemeVO.class);
+        return ResultUtils.getResult(themeVOList,pageMap);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void editThemeFolder(FolderDTO dto) {
         ThemeFolder folder = new ThemeFolder();
         if(null != dto.getId()){
@@ -178,6 +184,7 @@ public class MaterialServiceImpl implements MaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void editMaterialFolder(FolderDTO dto) {
         MaterialFolder folder = new MaterialFolder();
         if(null != dto.getId()){
@@ -196,6 +203,7 @@ public class MaterialServiceImpl implements MaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void addMyAlbum(String tfId, String themeId,String orgaId) {
         ThemeInFolder themeInFolder = new ThemeInFolder();
         if(StringUtils.isEmpty(tfId)){
@@ -215,11 +223,13 @@ public class MaterialServiceImpl implements MaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteMyAlbum(String id) {
         themeInFolderRepository.deleteById(id);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteThemeFolder(String id) {
         List<String> resultString = new ArrayList<>();
         resultString = getThemeFolder(id,resultString);
@@ -228,6 +238,7 @@ public class MaterialServiceImpl implements MaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteMaterialFolder(String id) {
         List<String> resultString = new ArrayList<>();
         resultString = getMaterialFolder(id,resultString);
@@ -236,6 +247,7 @@ public class MaterialServiceImpl implements MaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void moveMyMaterial(String mifId,String folderId, String materialId) {
         MaterialInFolder materialInFolder = new MaterialInFolder();
         if(null != mifId){
@@ -247,6 +259,7 @@ public class MaterialServiceImpl implements MaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteMyMaterial(String materialId) {
         materialInFolderRepository.deleteAllByMaterialId(materialId);
         materialRepository.deleteById(materialId);

system/src/main/java/com/canvas/web/modules/material/service/impl/ThemeClassServiceImpl.java

@@ -9,6 +9,7 @@ import com.canvas.web.modules.material.repository.ThemeClassRepository;
 import com.canvas.web.modules.material.service.ThemeClassService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -20,10 +21,11 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class ThemeClassServiceImpl implements ThemeClassService {
 
-    ThemeClassRepository themeClassRepository;
-    OrgaClassRepository orgaClassRepository;
+    private final ThemeClassRepository themeClassRepository;
+    private final OrgaClassRepository orgaClassRepository;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void edit(ThemeClassDTO dto) {
         ThemeClass themeClass = new ThemeClass();
         if(null != dto.getId()){
@@ -32,6 +34,7 @@ public class ThemeClassServiceImpl implements ThemeClassService {
         }else{
             themeClass.setCreateTime(new Timestamp(new Date().getTime()));
             themeClass.setUpdateTime(new Timestamp(new Date().getTime()));
+            themeClass.setIsDel(false);
         }
         themeClass.setIsAll(dto.getIsAll());
         themeClass.setClassName(dto.getClassName());