From 6cc3ee53a1088abf6a8083c9e72ca9647bb6428f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 六月 2025 16:56:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/vo/FootDataVO.java | 46 ++++++
server/src/main/java/com/doumee/service/business/CarouselService.java | 7 +
server/src/main/java/com/doumee/dao/business/model/Information.java | 12 +
server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java | 108 ++++++++++++++-
server/src/main/java/com/doumee/api/web/WebApiController.java | 10
server/src/main/java/com/doumee/service/business/InformationService.java | 2
server/src/main/java/com/doumee/api/business/InformationController.java | 9 +
server/src/main/java/com/doumee/api/common/PublicCloudController.java | 8
/dev/null | 39 -----
server/src/main/java/com/doumee/core/constants/Constants.java | 8 +
server/src/main/java/com/doumee/dao/business/model/Carousel.java | 10
server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java | 43 ++++--
server/src/main/java/com/doumee/api/system/SystemController.java | 8
server/src/main/java/com/doumee/api/business/CarouselController.java | 15 ++
server/src/main/java/com/doumee/dao/dto/FootDataDTO.java | 41 +++++
15 files changed, 282 insertions(+), 84 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/business/CarouselController.java b/server/src/main/java/com/doumee/api/business/CarouselController.java
index 467fd54..6a8b602 100644
--- a/server/src/main/java/com/doumee/api/business/CarouselController.java
+++ b/server/src/main/java/com/doumee/api/business/CarouselController.java
@@ -7,6 +7,8 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.Carousel;
+import com.doumee.dao.dto.FootDataDTO;
+import com.doumee.dao.vo.FootDataVO;
import com.doumee.service.business.CarouselService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -100,4 +102,17 @@
return ApiResponse.success(null);
}
+ @ApiOperation("鑾峰彇foot閰嶇疆")
+ @GetMapping("/getFoodDataVO")
+ public ApiResponse<FootDataVO> getFoodDataVO() {
+ return ApiResponse.success(carouselService.getFoodDataVO());
+ }
+
+ @ApiOperation("鏇存柊foot閰嶇疆")
+ @PostMapping("/updFoodData")
+ public ApiResponse<FootDataVO> updFoodData(@RequestBody FootDataDTO footDataDTO) {
+ carouselService.updFoodDataVO(footDataDTO);
+ return ApiResponse.success(null);
+ }
+
}
diff --git a/server/src/main/java/com/doumee/api/business/InformationController.java b/server/src/main/java/com/doumee/api/business/InformationController.java
index c149bd0..b646390 100644
--- a/server/src/main/java/com/doumee/api/business/InformationController.java
+++ b/server/src/main/java/com/doumee/api/business/InformationController.java
@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.dao.business.model.Carousel;
import com.doumee.dao.business.model.Information;
import com.doumee.service.business.InformationService;
import io.swagger.annotations.Api;
@@ -84,4 +85,12 @@
}
+ @ApiOperation("淇敼鐘舵��")
+ @PostMapping("/updateStatus")
+ @RequiresPermissions("business:information:update")
+ public ApiResponse updateStatus(@RequestBody Information information) {
+ informationService.updateStatus(information);
+ return ApiResponse.success(null);
+ }
+
}
diff --git a/server/src/main/java/com/doumee/api/common/PublicCloudController.java b/server/src/main/java/com/doumee/api/common/PublicCloudController.java
index 149d369..6a8ff19 100644
--- a/server/src/main/java/com/doumee/api/common/PublicCloudController.java
+++ b/server/src/main/java/com/doumee/api/common/PublicCloudController.java
@@ -59,15 +59,15 @@
@ApiImplicitParam(name = "file", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
})
@PostMapping(value = "/uploadLocal", headers = "content-type=multipart/form-data")
- public void uploadLocal(String folder, HttpServletRequest request, HttpServletResponse response) throws Exception {
+ public void uploadLocal(HttpServletRequest request, HttpServletResponse response) throws Exception {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- uploadFileLocal(multipartRequest, folder+ "/", response,
+ uploadFileLocal(multipartRequest, response,
systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.IMG_DIR).getCode() ,
systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode());
}
- public void uploadFileLocal(HttpServletRequest request, String folder, HttpServletResponse response, String rootPath,String dir) throws Exception {
+ public void uploadFileLocal(HttpServletRequest request, HttpServletResponse response, String rootPath,String dir) throws Exception {
response.setCharacterEncoding("UTF-8");
response.setContentType("text/html;charset=UTF-8");
CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
@@ -90,7 +90,7 @@
return;
}
String nowDate = DateUtil.getNowShortDate();
- folder += nowDate + "/";
+ String folder = nowDate + "/";
String strDirPath = rootPath + folder;
File dirPath = new File(strDirPath);
if (!dirPath.exists()) {
diff --git a/server/src/main/java/com/doumee/api/system/SystemController.java b/server/src/main/java/com/doumee/api/system/SystemController.java
index 3e798b8..366e4bf 100644
--- a/server/src/main/java/com/doumee/api/system/SystemController.java
+++ b/server/src/main/java/com/doumee/api/system/SystemController.java
@@ -41,8 +41,8 @@
@PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("鐧诲綍")
- @EncryptionReq
- @EncryptionResp
+// @EncryptionReq
+// @EncryptionResp
@PostMapping("/login")
public ApiResponse<String> login (@Validated @RequestBody LoginDTO dto, HttpServletRequest request) {
return ApiResponse.success(systemLoginService.loginByPassword(dto, request));
@@ -58,8 +58,8 @@
@Trace(withRequestParameters = false)
@ApiOperation("淇敼褰撳墠鐢ㄦ埛瀵嗙爜")
- @EncryptionReq
- @EncryptionResp
+// @EncryptionReq
+// @EncryptionResp
@PostMapping("/updatePwd")
public ApiResponse updatePwd (@Validated @RequestBody UpdatePwdDto dto) {
dto.setUserId(this.getLoginUser().getId());
diff --git a/server/src/main/java/com/doumee/api/web/WebApiController.java b/server/src/main/java/com/doumee/api/web/WebApiController.java
index 72f1f35..43e5930 100644
--- a/server/src/main/java/com/doumee/api/web/WebApiController.java
+++ b/server/src/main/java/com/doumee/api/web/WebApiController.java
@@ -9,7 +9,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Carousel;
import com.doumee.dao.business.model.Information;
-import com.doumee.dao.web.vo.CategoryVO;
+import com.doumee.dao.vo.FootDataVO;
import com.doumee.service.business.CarouselService;
import com.doumee.service.business.InformationService;
import io.swagger.annotations.Api;
@@ -58,9 +58,11 @@
return ApiResponse.success(informationService.findById(id));
}
-
-
-
+ @ApiOperation("鑾峰彇foot閰嶇疆")
+ @GetMapping("/getFoodDataVO")
+ public ApiResponse<FootDataVO> getFoodDataVO() {
+ return ApiResponse.success(carouselService.getFoodDataVO());
+ }
diff --git a/server/src/main/java/com/doumee/core/constants/Constants.java b/server/src/main/java/com/doumee/core/constants/Constants.java
index 795460f..46e31ec 100644
--- a/server/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/src/main/java/com/doumee/core/constants/Constants.java
@@ -33,6 +33,14 @@
public static final String SYSTEM ="SYSTEM" ;
public static final String IMG_DIR = "IMG_DIR";
public static final String FILE_DIR ="FILE_DIR" ;
+ public static final String FOOT_IMGURL ="FOOT_IMGURL" ;
+ public static final String LINK_PHONE ="LINK_PHONE" ;
+ public static final String LINK_MOBILE ="LINK_MOBILE" ;
+ public static final String SERVER_TIME ="SERVER_TIME" ;
+ public static final String ADDRESS ="ADDRESS" ;
+ public static final String SOLVE_SCHEME ="SOLVE_SCHEME" ;
+ public static final String WISDOM_SYSTEM ="WISDOM_SYSTEM" ;
+ public static final String FOOT_WORDS ="FOOT_WORDS" ;
public static final String QYWX = "QYWX";
diff --git a/server/src/main/java/com/doumee/dao/business/model/Carousel.java b/server/src/main/java/com/doumee/dao/business/model/Carousel.java
index 11ec518..45cd9c1 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Carousel.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Carousel.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -58,7 +56,7 @@
@ApiModelProperty(value = "鎻忚堪")
@ExcelColumn(name="鎻忚堪")
- private String describe;
+ private String detail;
@ApiModelProperty(value = "鍥剧墖鍦板潃")
@ExcelColumn(name="鍥剧墖鍦板潃")
@@ -72,13 +70,13 @@
@ExcelColumn(name="绫诲瀷锛�0=棣栭〉杞挱锛�")
private Integer type;
- @ApiModelProperty(value = "璺宠浆绫诲瀷锛�0=鏃狅紱1=澶栭摼锛�2=瀵屾枃鏈紱3=鍐呴儴鍦板潃", example = "1")
- @ExcelColumn(name="璺宠浆绫诲瀷锛�0=鏃狅紱1=澶栭摼锛�2=瀵屾枃鏈紱3=鍐呴儴鍦板潃")
+ @ApiModelProperty(value = "璺宠浆绫诲瀷锛�0=澶栭摼锛�1=瀵屾枃鏈紱", example = "1")
+ @ExcelColumn(name="璺宠浆绫诲瀷锛�0=鏃狅紱1=澶栭摼锛�")
private Integer jumpType;
@ApiModelProperty(value = "璺宠浆鍦板潃")
@ExcelColumn(name="璺宠浆鍦板潃")
- private String contnet;
+ private String content;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
diff --git a/server/src/main/java/com/doumee/dao/business/model/Information.java b/server/src/main/java/com/doumee/dao/business/model/Information.java
index 113c39d..eb4a68b 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Information.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Information.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -58,11 +56,11 @@
@ApiModelProperty(value = "鎻忚堪")
@ExcelColumn(name="鎻忚堪")
- private String describe;
+ private String detail;
@ApiModelProperty(value = "鍐呭")
@ExcelColumn(name="鍐呭")
- private String contnet;
+ private String content;
@ApiModelProperty(value = "灏侀潰鍥剧墖鍦板潃")
@ExcelColumn(name="灏侀潰鍥剧墖鍦板潃")
@@ -70,13 +68,17 @@
@ApiModelProperty(value = "鍙戝竷鏃堕棿")
@ExcelColumn(name="鍙戝竷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date releaseDate;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+
+ @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤", example = "1")
+ @ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤")
+ private Integer status;
+
@ApiModelProperty(value = "灏侀潰鍥剧墖鍦板潃")
@TableField(exist = false)
private String fullImgurl;
diff --git a/server/src/main/java/com/doumee/dao/dto/FootDataDTO.java b/server/src/main/java/com/doumee/dao/dto/FootDataDTO.java
new file mode 100644
index 0000000..d878523
--- /dev/null
+++ b/server/src/main/java/com/doumee/dao/dto/FootDataDTO.java
@@ -0,0 +1,41 @@
+package com.doumee.dao.dto;
+
+import com.alibaba.fastjson.JSONArray;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2025/4/8 9:20
+ */
+@Data
+public class FootDataDTO {
+
+ @ApiModelProperty(value = "foot浜岀淮鐮�")
+ private String footImgUrl;
+
+ @ApiModelProperty(value = "foot鏂囨")
+ private String footWords;
+
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String linkPhone;
+
+ @ApiModelProperty(value = "鑱旂郴鎵嬫満")
+ private String linkMobile;
+
+ @ApiModelProperty(value = "鏈嶅姟鏃堕棿")
+ private String serverTime;
+
+ @ApiModelProperty(value = "鍏徃鍦板潃")
+ private String address;
+
+ @ApiModelProperty(value = "瑙ｅ喅鏂规锛圼{\"name\":\"瑙ｅ喅鏂规涓�\",\"address\":\"璺宠浆鍦板潃涓�\"},{\"name\":\"瑙ｅ喅鏂规浜孿",\"address\":\"璺宠浆鍦板潃浜孿"}]锛�")
+ private JSONArray solveScheme;
+
+ @ApiModelProperty(value = "鏅烘収绯荤粺锛圼{\"name\":\"鏅烘収绯荤粺涓�\",\"address\":\"璺宠浆鍦板潃涓�\"},{\"name\":\"鏅烘収绯荤粺浜孿",\"address\":\"璺宠浆鍦板潃浜孿"}]锛�")
+ private JSONArray wisdomSystem;
+
+
+}
diff --git a/server/src/main/java/com/doumee/dao/vo/FootDataVO.java b/server/src/main/java/com/doumee/dao/vo/FootDataVO.java
new file mode 100644
index 0000000..1f74746
--- /dev/null
+++ b/server/src/main/java/com/doumee/dao/vo/FootDataVO.java
@@ -0,0 +1,46 @@
+package com.doumee.dao.vo;
+
+import com.alibaba.fastjson.JSONArray;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2025/4/8 9:20
+ */
+@Data
+public class FootDataVO {
+
+ @ApiModelProperty(value = "foot浜岀淮鐮�")
+ private String footImgUrl;
+
+ @ApiModelProperty(value = "foot浜岀淮鐮佸叏璺緞")
+ private String footFullImgUrl;
+
+ @ApiModelProperty(value = "foot鏂囨")
+ private String footWords;
+
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String linkPhone;
+
+ @ApiModelProperty(value = "鑱旂郴鎵嬫満")
+ private String linkMobile;
+
+ @ApiModelProperty(value = "鏈嶅姟鏃堕棿")
+ private String serverTime;
+
+ @ApiModelProperty(value = "鍏徃鍦板潃")
+ private String address;
+
+ @ApiModelProperty(value = "瑙ｅ喅鏂规锛圼{\"name\":\"瑙ｅ喅鏂规涓�\",\"address\":\"璺宠浆鍦板潃涓�\"},{\"name\":\"瑙ｅ喅鏂规浜孿",\"address\":\"璺宠浆鍦板潃浜孿"}]锛�")
+ private JSONArray solveScheme;
+
+ @ApiModelProperty(value = "鏅烘収绯荤粺锛圼{\"name\":\"鏅烘収绯荤粺涓�\",\"address\":\"璺宠浆鍦板潃涓�\"},{\"name\":\"鏅烘収绯荤粺浜孿",\"address\":\"璺宠浆鍦板潃浜孿"}]锛�")
+ private JSONArray wisdomSystem;
+
+
+}
diff --git a/server/src/main/java/com/doumee/dao/web/vo/CategoryVO.java b/server/src/main/java/com/doumee/dao/web/vo/CategoryVO.java
deleted file mode 100644
index 782abe5..0000000
--- a/server/src/main/java/com/doumee/dao/web/vo/CategoryVO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.doumee.dao.web.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2025/4/8 9:20
- */
-@Data
-public class CategoryVO {
-
- @ApiModelProperty(value = "鍒嗙被涓婚敭")
- private Integer id;
-
- @ApiModelProperty(value = "鍒嗙被鍚嶇О")
- private String name;
-
- @ApiModelProperty(value = "鐖剁骇鍒嗙被涓婚敭",hidden = true)
- private Integer parentId;
-
- @ApiModelProperty(value = "瀛愮被闆嗗悎")
- private List<CategoryVO> childList;
-
-}
diff --git a/server/src/main/java/com/doumee/dao/web/vo/CategoryVOTree.java b/server/src/main/java/com/doumee/dao/web/vo/CategoryVOTree.java
deleted file mode 100644
index e401b15..0000000
--- a/server/src/main/java/com/doumee/dao/web/vo/CategoryVOTree.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.doumee.dao.web.vo;
-
-import com.doumee.core.constants.Constants;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2025/4/8 9:19
- */
-public class CategoryVOTree {
-
- // 淇濆瓨鍙備笌鏋勫缓鏍戝舰鐨勬墍鏈夋暟鎹紙閫氬父鏁版嵁搴撴煡璇㈢粨鏋滐級
- public List<CategoryVO> nodeList = new ArrayList<>();
-
- /**
- * 鏋勯�犳柟娉�
- * @param nodeList 灏嗘暟鎹泦鍚堣祴鍊肩粰nodeList锛屽嵆鎵�鏈夋暟鎹綔涓烘墍鏈夎妭鐐广��
- */
- public CategoryVOTree(List<CategoryVO> nodeList){
- this.nodeList = nodeList;
- }
-
-
- /**
- * 鑾峰彇闇�鏋勫缓鐨勬墍鏈夋牴鑺傜偣锛堥《绾ц妭鐐癸級 "0"
- * @return 鎵�鏈夋牴鑺傜偣List闆嗗悎
- */
- public List<CategoryVO> getRootNode(){
- // 淇濆瓨鎵�鏈夋牴鑺傜偣锛堟墍鏈夋牴鑺傜偣鐨勬暟鎹級
- List<CategoryVO> rootNodeList = new ArrayList<>();
- // treeNode锛氭煡璇㈠嚭鐨勬瘡涓�鏉℃暟鎹紙鑺傜偣锛�
- for (CategoryVO treeNode : nodeList){
- // 鍒ゆ柇褰撳墠鑺傜偣鏄惁涓烘牴鑺傜偣锛屾澶勬敞鎰忥細鑻arentId绫诲瀷鏄疭tring锛屽垯瑕侀噰鐢╡quals()鏂规硶鍒ゆ柇銆�
- if(Objects.isNull(treeNode.getParentId())){
- rootNodeList.add(treeNode);
- }
- }
- return rootNodeList;
- }
-
-
- /**
- * 鏍规嵁姣忎竴涓《绾ц妭鐐癸紙鏍硅妭鐐癸級杩涜鏋勫缓鏍戝舰缁撴瀯
- * @return 鏋勫缓鏁存５鏍�
- */
- public List<CategoryVO> buildTree(){
- // treeNodes锛氫繚瀛樹竴涓《绾ц妭鐐规墍鏋勫缓鍑烘潵鐨勫畬鏁存爲褰�
- List<CategoryVO> treeNodes = new ArrayList<CategoryVO>();
- // getRootNode()锛氳幏鍙栨墍鏈夌殑鏍硅妭鐐�
- for (CategoryVO treeRootNode : getRootNode()) {
- // 灏嗛《绾ц妭鐐硅繘琛屾瀯寤哄瓙鏍�
- treeRootNode = buildChildTree(treeRootNode);
- // 瀹屾垚涓�涓《绾ц妭鐐规墍鏋勫缓鐨勬爲褰紝澧炲姞杩涙潵
- treeNodes.add(treeRootNode);
- }
- return treeNodes;
- }
-
- /**
- * 閫掑綊-----鏋勫缓瀛愭爲褰㈢粨鏋�
- * @param pNode 鏍硅妭鐐癸紙椤剁骇鑺傜偣锛�
- * @return 鏁存５鏍�
- */
- public CategoryVO buildChildTree(CategoryVO pNode){
- List<CategoryVO> childTree = new ArrayList<CategoryVO>();
- // nodeList锛氭墍鏈夎妭鐐归泦鍚堬紙鎵�鏈夋暟鎹級
- for (CategoryVO treeNode : nodeList) {
- // 鍒ゆ柇褰撳墠鑺傜偣鐨勭埗鑺傜偣ID鏄惁绛変簬鏍硅妭鐐圭殑ID锛屽嵆褰撳墠鑺傜偣涓哄叾涓嬬殑瀛愯妭鐐�
-
- if (!Objects.isNull(treeNode.getParentId())&& Constants.equalsInteger(treeNode.getParentId(),pNode.getId())) {
- // 鍐嶉�掑綊杩涜鍒ゆ柇褰撳墠鑺傜偣鐨勬儏鍐碉紝璋冪敤鑷韩鏂规硶
- childTree.add(buildChildTree(treeNode));
- }
- }
- // for寰幆缁撴潫锛屽嵆鑺傜偣涓嬫病鏈変换浣曡妭鐐癸紝鏍戝舰鏋勫缓缁撴潫锛岃缃爲缁撴灉
- pNode.setChildList(childTree);
- return pNode;
- }
-
-
-
-
-}
diff --git a/server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java b/server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java
deleted file mode 100644
index aa63d8e..0000000
--- a/server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.doumee.dao.web.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2025/4/8 9:20
- */
-@Data
-public class WorkOrderDataVO {
-
- @ApiModelProperty(value = "鏃ユ湡")
- private String dateStr;
-
- @ApiModelProperty(value = "鎬绘暟")
- private Integer total;
-
- @ApiModelProperty(value = "SHE鎬绘暟")
- private Integer sheTotal;
- @ApiModelProperty(value = "DCA绗﹀悎鎬绘暟")
- private Integer dcaYesTotal;
- @ApiModelProperty(value = "DCA涓嶇鍚堟�绘暟")
- private Integer dcaNoTotal;
-
- @ApiModelProperty(value = "WTS鎬绘暟")
- private Integer wtsTotal;
-
- @ApiModelProperty(value = "宸ョ▼甯堟�绘暟")
- private Integer gcsTotal;
-
- @ApiModelProperty(value = "鏈叧闂�绘暟")
- private Integer unCloseTotal;
-
-}
diff --git a/server/src/main/java/com/doumee/service/business/CarouselService.java b/server/src/main/java/com/doumee/service/business/CarouselService.java
index d3ca55a..8010b70 100644
--- a/server/src/main/java/com/doumee/service/business/CarouselService.java
+++ b/server/src/main/java/com/doumee/service/business/CarouselService.java
@@ -3,6 +3,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Carousel;
+import com.doumee.dao.dto.FootDataDTO;
+import com.doumee.dao.vo.FootDataVO;
+
import java.util.List;
/**
@@ -106,4 +109,8 @@
*/
void updateSortnum(Carousel carousel);
+ FootDataVO getFoodDataVO();
+
+ void updFoodDataVO(FootDataDTO footDataDTO);
+
}
diff --git a/server/src/main/java/com/doumee/service/business/InformationService.java b/server/src/main/java/com/doumee/service/business/InformationService.java
index 0225176..c1027bd 100644
--- a/server/src/main/java/com/doumee/service/business/InformationService.java
+++ b/server/src/main/java/com/doumee/service/business/InformationService.java
@@ -94,4 +94,6 @@
* @return long
*/
long count(Information information);
+
+ void updateStatus(Information information);
}
diff --git a/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java
index 0efc79c..e8d5199 100644
--- a/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
@@ -10,14 +12,19 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CarouselMapper;
import com.doumee.dao.business.model.Carousel;
+import com.doumee.dao.dto.FootDataDTO;
+import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.vo.FootDataVO;
import com.doumee.service.business.CarouselService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.system.SystemDictDataService;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@@ -39,18 +46,21 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private SystemDictDataService systemDictDataService;
+
@Override
public Integer create(Carousel carousel) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Objects.isNull(carousel)
- || Objects.isNull(carousel.getType())
- || Objects.isNull(carousel.getImgurl())
+// || Objects.isNull(carousel.getImgurl())
|| Objects.isNull(carousel.getJumpType())
- || Objects.isNull(carousel.getSortnum())
- || (!Constants.equalsInteger(carousel.getJumpType(),Constants.ZERO) && StringUtils.isEmpty(carousel.getContnet()))
+// || Objects.isNull(carousel.getSortnum())
+ || StringUtils.isEmpty(carousel.getTitle())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ carousel.setType(Constants.ZERO);
carousel.setIsdeleted(Constants.ZERO);
carousel.setStatus(Constants.ZERO);
carousel.setCreateDate(new Date());
@@ -84,11 +94,9 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Objects.isNull(carousel)
|| Objects.isNull(carousel.getId())
- || Objects.isNull(carousel.getType())
|| Objects.isNull(carousel.getImgurl())
|| Objects.isNull(carousel.getJumpType())
|| Objects.isNull(carousel.getSortnum())
- || (!Constants.equalsInteger(carousel.getJumpType(),Constants.ZERO) && StringUtils.isEmpty(carousel.getContnet()))
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -180,12 +188,14 @@
.eq(pageWrap.getModel().getId() != null, Carousel::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getRemark() != null, Carousel::getRemark, pageWrap.getModel().getRemark())
.like(pageWrap.getModel().getTitle() != null, Carousel::getTitle, pageWrap.getModel().getTitle())
- .like(pageWrap.getModel().getDescribe() != null, Carousel::getDescribe, pageWrap.getModel().getDescribe())
+ .like(pageWrap.getModel().getDetail() != null, Carousel::getDetail, pageWrap.getModel().getDetail())
.eq(pageWrap.getModel().getType() != null, Carousel::getType, pageWrap.getModel().getType())
.eq(pageWrap.getModel().getJumpType() != null, Carousel::getJumpType, pageWrap.getModel().getJumpType())
- .eq(pageWrap.getModel().getContnet() != null, Carousel::getContnet, pageWrap.getModel().getContnet())
+ .like(pageWrap.getModel().getContent() != null, Carousel::getContent, pageWrap.getModel().getContent())
.eq(pageWrap.getModel().getSortnum() != null, Carousel::getSortnum, pageWrap.getModel().getSortnum())
.eq(pageWrap.getModel().getStatus() != null, Carousel::getStatus, pageWrap.getModel().getStatus())
+ .orderByDesc(Carousel::getSortnum)
+
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -207,4 +217,86 @@
QueryWrapper<Carousel> wrapper = new QueryWrapper<>(carousel);
return carouselMapper.selectCount(wrapper);
}
+
+
+
+ @Override
+ public FootDataVO getFoodDataVO(){
+ FootDataVO footDataVO = new FootDataVO();
+ footDataVO.setFootWords(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FOOT_WORDS).getCode());
+ footDataVO.setFootImgUrl(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FOOT_IMGURL).getCode());
+ footDataVO.setFootFullImgUrl(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode() +
+ systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FOOT_IMGURL).getCode());
+ footDataVO.setAddress(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ADDRESS).getCode());
+ footDataVO.setLinkPhone(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.LINK_PHONE).getCode());
+ footDataVO.setLinkMobile(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.LINK_MOBILE).getCode());
+ SystemDictData solveScheme = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SOLVE_SCHEME);
+ if(Objects.nonNull(solveScheme) & org.apache.commons.lang3.StringUtils.isNotBlank(solveScheme.getCode())){
+ footDataVO.setSolveScheme(JSONArray.parseArray(solveScheme.getCode()));
+ }
+ SystemDictData wisdomSystem = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.WISDOM_SYSTEM);
+ if(Objects.nonNull(wisdomSystem) & org.apache.commons.lang3.StringUtils.isNotBlank(wisdomSystem.getCode())){
+ footDataVO.setWisdomSystem(JSONArray.parseArray(wisdomSystem.getCode()));
+ }
+ footDataVO.setServerTime(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_TIME).getCode());
+ return footDataVO;
+ }
+
+
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class})
+ public void updFoodDataVO(FootDataDTO footDataDTO) {
+ SystemDictData footWords = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FOOT_WORDS);
+ if (Objects.nonNull(footWords)) {
+ footWords.setCode(footDataDTO.getFootWords());
+ systemDictDataBiz.updateById(footWords);
+ }
+
+ SystemDictData footImgUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FOOT_IMGURL);
+ if (Objects.nonNull(footImgUrl)) {
+ footImgUrl.setCode(footDataDTO.getFootImgUrl());
+ systemDictDataBiz.updateById(footImgUrl);
+ }
+
+ SystemDictData linkPhone = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.LINK_PHONE);
+ if (Objects.nonNull(linkPhone)) {
+ linkPhone.setCode(footDataDTO.getLinkPhone());
+ systemDictDataBiz.updateById(linkPhone);
+ }
+
+ SystemDictData linkMobile = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.LINK_MOBILE);
+ if (Objects.nonNull(linkMobile)) {
+ linkMobile.setCode(footDataDTO.getLinkMobile());
+ systemDictDataBiz.updateById(linkMobile);
+ }
+
+ SystemDictData serverTime = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.SERVER_TIME);
+ if (Objects.nonNull(serverTime)) {
+ serverTime.setCode(footDataDTO.getServerTime());
+ systemDictDataBiz.updateById(serverTime);
+ }
+
+ SystemDictData address = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ADDRESS);
+ if (Objects.nonNull(address)) {
+ address.setCode(footDataDTO.getAddress());
+ systemDictDataBiz.updateById(address);
+ }
+
+ SystemDictData solveScheme = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.SOLVE_SCHEME);
+ if (Objects.nonNull(solveScheme)&&Objects.nonNull(footDataDTO.getSolveScheme())) {
+ solveScheme.setCode(footDataDTO.getSolveScheme().toString());
+ systemDictDataBiz.updateById(solveScheme);
+ }
+
+ SystemDictData wisdomSystem = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.WISDOM_SYSTEM);
+ if (Objects.nonNull(wisdomSystem)&&Objects.nonNull(footDataDTO.getWisdomSystem())) {
+ wisdomSystem.setCode(footDataDTO.getWisdomSystem().toString());
+ systemDictDataBiz.updateById(wisdomSystem);
+ }
+ }
+
+
+
}
diff --git a/server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java
index 225d9f6..2a36d54 100644
--- a/server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java
@@ -44,12 +44,12 @@
public Integer create(Information information) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Objects.isNull(information)
- || Objects.isNull(information.getSortnum())
- || Objects.isNull(information.getReleaseDate())
+// || Objects.isNull(information.getSortnum())
+// || Objects.isNull(information.getReleaseDate())
|| StringUtils.isEmpty(information.getTitle())
- || StringUtils.isEmpty(information.getContnet())
- || StringUtils.isEmpty(information.getDescribe())
- || StringUtils.isEmpty(information.getImgurl())
+// || StringUtils.isEmpty(information.getContent())
+// || StringUtils.isEmpty(information.getDetail())
+// || StringUtils.isEmpty(information.getImgurl())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -84,12 +84,12 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Objects.isNull(information)
|| Objects.isNull(information.getId())
- || Objects.isNull(information.getSortnum())
- || Objects.isNull(information.getReleaseDate())
+// || Objects.isNull(information.getSortnum())
+// || Objects.isNull(information.getReleaseDate())
|| StringUtils.isEmpty(information.getTitle())
- || StringUtils.isEmpty(information.getContnet())
- || StringUtils.isEmpty(information.getDescribe())
- || StringUtils.isEmpty(information.getImgurl())
+// || StringUtils.isEmpty(information.getContent())
+// || StringUtils.isEmpty(information.getDetail())
+// || StringUtils.isEmpty(information.getImgurl())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -140,9 +140,9 @@
.eq(Information::getIsdeleted,Constants.ZERO)
.eq(pageWrap.getModel().getId() != null, Information::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getRemark() != null, Information::getRemark, pageWrap.getModel().getRemark())
- .eq(pageWrap.getModel().getTitle() != null, Information::getTitle, pageWrap.getModel().getTitle())
- .eq(pageWrap.getModel().getDescribe() != null, Information::getDescribe, pageWrap.getModel().getDescribe())
- .eq(pageWrap.getModel().getContnet() != null, Information::getContnet, pageWrap.getModel().getContnet())
+ .like(pageWrap.getModel().getTitle() != null, Information::getTitle, pageWrap.getModel().getTitle())
+ .like(pageWrap.getModel().getDetail() != null, Information::getDetail, pageWrap.getModel().getDetail())
+ .like(pageWrap.getModel().getContent() != null, Information::getContent, pageWrap.getModel().getContent())
.ge(pageWrap.getModel().getReleaseDate() != null, Information::getReleaseDate, Utils.Date.getStart(pageWrap.getModel().getReleaseDate()))
.le(pageWrap.getModel().getReleaseDate() != null, Information::getReleaseDate, Utils.Date.getEnd(pageWrap.getModel().getReleaseDate()))
;
@@ -156,7 +156,7 @@
IPage<Information> iPage = informationMapper.selectPage(page, queryWrapper);
String fileDir = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode();
for (Information information:iPage.getRecords()) {
- if(Objects.isNull(information)&& org.apache.commons.lang3.StringUtils.isNotBlank(information.getImgurl())){
+ if(!Objects.isNull(information)&& org.apache.commons.lang3.StringUtils.isNotBlank(information.getImgurl())){
information.setFullImgurl(fileDir + information.getImgurl());
}
}
@@ -168,4 +168,19 @@
QueryWrapper<Information> wrapper = new QueryWrapper<>(information);
return informationMapper.selectCount(wrapper);
}
+
+
+
+ @Override
+ public void updateStatus(Information information){
+ if(Objects.isNull(information)
+ || Objects.isNull(information.getStatus())
+ || Objects.isNull(information.getId())
+ || !(Constants.equalsInteger(information.getStatus(),Constants.ZERO)
+ || Constants.equalsInteger(information.getStatus(),Constants.ONE))
+ ){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ informationMapper.update(new UpdateWrapper<Information>().lambda().set(Information::getStatus,information.getStatus()).eq(Information::getId,information.getId()));
+ }
}
--
Gitblit v1.9.3