From 4f689a1d6d54e7d3b00c2d8a9dcab48473726a0d Mon Sep 17 00:00:00 2001 From: chaiyapeng <3535863041@qq.com> Date: Mon, 26 Aug 2024 21:54:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/$PROJECT_FILE$ | 468 ------------------ .idea/.gitignore | 8 - .idea/inspectionProfiles/Project_Default.xml | 6 - .idea/misc.xml | 24 +- .idea/qaplug_profiles.xml | 465 ----------------- .idea/setting.xml | 8 - .idea/uiDesigner.xml | 124 ----- .idea/vcs.xml | 2 +- .../src/main/java/com/muyu/domain/User.java | 44 -- cloud-mart-server/pom.xml | 8 +- .../muyu/cloud/mart/MarketApplication.java | 5 + .../mart/controller/ConnectorController.java | 8 +- .../cloud/mart/controller/UserController.java | 68 --- .../cloud/mart/mapper/ConnectorMapper.java | 2 + .../muyu/cloud/mart/mapper/UserMapper.java | 16 - .../cloud/mart/service/ConnectorService.java | 1 + .../muyu/cloud/mart/service/UserService.java | 27 - .../service/impl/ConnectorServiceImpl.java | 16 +- .../mart/service/impl/UserServiceImpl.java | 75 --- .../resources/mapper/ConnectorMappers.xml | 3 + 20 files changed, 42 insertions(+), 1336 deletions(-) delete mode 100644 .idea/$PROJECT_FILE$ delete mode 100644 .idea/.gitignore delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/qaplug_profiles.xml delete mode 100644 .idea/setting.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 cloud-mart-common/src/main/java/com/muyu/domain/User.java delete mode 100644 cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/UserController.java delete mode 100644 cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/UserMapper.java delete mode 100644 cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/UserService.java delete mode 100644 cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/UserServiceImpl.java diff --git a/.idea/$PROJECT_FILE$ b/.idea/$PROJECT_FILE$ deleted file mode 100644 index c1ce1bb..0000000 --- a/.idea/$PROJECT_FILE$ +++ /dev/null @@ -1,468 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 35410ca..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index c32584c..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 9fc3d5f..78f492e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,12 +1,6 @@ - - - - - - - - 用户定义 - - - - - - - - - - + \ No newline at end of file diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml deleted file mode 100644 index 3dfd21f..0000000 --- a/.idea/qaplug_profiles.xml +++ /dev/null @@ -1,465 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/setting.xml b/.idea/setting.xml deleted file mode 100644 index ed05fd8..0000000 --- a/.idea/setting.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/cloud-mart-common/src/main/java/com/muyu/domain/User.java b/cloud-mart-common/src/main/java/com/muyu/domain/User.java deleted file mode 100644 index 3566837..0000000 --- a/cloud-mart-common/src/main/java/com/muyu/domain/User.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.muyu.domain; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @Author：chaiyapeng - * @Package：com.muyu.domain - * @Project：cloud-mart - * @name：User - * @Date：2024/8/22 15:26 - */ -@Data -public class User { - /** - * id - */ - private Integer userId; - /** - * 用户名 - */ - private String userName; - /** - * 密码 - */ - private String userPwd; - /** - * 手机号 - */ - private String userPhone; - /** - * 身份证 - */ - private String userIdentityCard; - /** - * 邮箱 - */ - private String userMailbox; - /** - * 余额 - */ - private BigDecimal userBalance; -} diff --git a/cloud-mart-server/pom.xml b/cloud-mart-server/pom.xml index 0f7ba8f..9a16816 100644 --- a/cloud-mart-server/pom.xml +++ b/cloud-mart-server/pom.xml @@ -119,8 +119,14 @@ 2.2.3 jdk15 + - + + com.github.tobato + fastdfs-client + 1.26.5 + + diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/MarketApplication.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/MarketApplication.java index 98229c2..448ce50 100644 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/MarketApplication.java +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/MarketApplication.java @@ -1,9 +1,12 @@ package com.muyu.cloud.mart; +import com.github.tobato.fastdfs.FdfsClientConfig; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Import; /** * @Author：chaiyapeng @@ -15,6 +18,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomConfig @EnableMyFeignClients @SpringBootApplication +//@Import(FdfsClientConfig.class) +//@EnableFeignClients public class MarketApplication { public static void main(String[] args) { SpringApplication.run(MarketApplication.class,args); diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/ConnectorController.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/ConnectorController.java index de50fe6..ba21df6 100644 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/ConnectorController.java +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/ConnectorController.java @@ -51,5 +51,11 @@ public class ConnectorController { public Result getDeleteConnector(@RequestParam(name = "connectorId") Long connectorId){ return connectorService.getDeleteConnector(connectorId); } - + /** + * 上传图片 + */ +// @PostMapping("upload") +// public Result upload(@RequestBody MultipartFile file){ +// return connectorService.upload(file); +// } } diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/UserController.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/UserController.java deleted file mode 100644 index 506f9e3..0000000 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/UserController.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.muyu.cloud.mart.controller; - -import com.dtflys.forest.annotation.Post; -import com.github.pagehelper.PageHelper; -import com.muyu.cloud.mart.mapper.UserMapper; -import com.muyu.cloud.mart.service.UserService; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.domain.User; -import com.muyu.domain.UserSearch; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author：chaiyapeng - * @Package：com.muyu.cloud.mart.controller - * @Project：cloud-mart - * @name：UserController - * @Date：2024/8/22 15:28 - */ -@RestController -@RequestMapping("user") -public class UserController extends BaseController { - - @Autowired - private UserService userService; - /** - * 查询所以用户信息 - */ - @GetMapping("getAllUsers") - public Result getAllUsers(){ - List list = userService.getAllUsers(); - return Result.success(list); - } - /** - * 添加新用户 - */ - @PostMapping("/addUser") - public Result addUser(@RequestBody User user){ - return userService.addUser(user); - } - /** - * 更新用户 - */ - @PostMapping("/updateUser") - public Result updateUser(@RequestBody User user){ - return userService.updateUser(user); - } - - /** - * 删除用户 - */ - @PostMapping("deleteUser") - public Result deleteUser(@RequestBody User user){ - return userService.deleteUser(user); - } - /** - * 多条件分页查询 - */ - @PostMapping("getAllUserByCon") - public Result getAllUserByCon(@RequestBody UserSearch userSearch){ - startPage(); - return userService.getAllUserByCon(userSearch); - } -} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/ConnectorMapper.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/ConnectorMapper.java index 0f27ba8..29ed267 100644 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/ConnectorMapper.java +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/ConnectorMapper.java @@ -14,4 +14,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface ConnectorMapper extends BaseMapper { int getDeleteConnector(Long connectorId); + + Integer updateConnector(Connector connector); } diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/UserMapper.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/UserMapper.java deleted file mode 100644 index 96a8600..0000000 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/UserMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.cloud.mart.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.domain.User; -import org.apache.ibatis.annotations.Mapper; - -/** - * @Author：chaiyapeng - * @Package：com.muyu.cloud.mart.mapper - * @Project：cloud-mart - * @name：UserMapper - * @Date：2024/8/22 15:28 - */ -@Mapper -public interface UserMapper extends BaseMapper { -} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/ConnectorService.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/ConnectorService.java index eaa969b..feeb3a1 100644 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/ConnectorService.java +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/ConnectorService.java @@ -22,4 +22,5 @@ public interface ConnectorService extends IService { Result getDeleteConnector(Long connectorId); +// Result upload(MultipartFile file); } diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/UserService.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/UserService.java deleted file mode 100644 index 66949eb..0000000 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/UserService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.muyu.cloud.mart.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.core.domain.Result; -import com.muyu.domain.User; -import com.muyu.domain.UserSearch; - -import java.util.List; - -/** - * @Author：chaiyapeng - * @Package：com.muyu.cloud.mart.service - * @Project：cloud-mart - * @name：UserService - * @Date：2024/8/22 15:28 - */ -public interface UserService extends IService { - List getAllUsers(); - - Result addUser(User user); - - Result updateUser(User user); - - Result deleteUser(User user); - - Result getAllUserByCon(UserSearch userSearch); -} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/ConnectorServiceImpl.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/ConnectorServiceImpl.java index 2669522..874f516 100644 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/ConnectorServiceImpl.java +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/ConnectorServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; public class ConnectorServiceImpl extends ServiceImpl implements ConnectorService { @Autowired private ConnectorMapper connectorMapper; +// @Autowired +// private FastFileStorageClient fastFileStorageClient; /** * 接口列表 @@ -46,7 +48,7 @@ public class ConnectorServiceImpl extends ServiceImpl0){ return Result.success(i,"更新成功"); } @@ -72,4 +74,16 @@ public class ConnectorServiceImpl extends ServiceImpl implements UserService { - @Autowired - private UserMapper userMapper; - - @Override - public List getAllUsers() { - List list = userMapper.selectList(null); - return list; - } - - @Override - public Result addUser(User user) { - Integer i = userMapper.insert(user); - if (i>0){ - return Result.success(i,"添加成功"); - }else { - return Result.error("添加失败"); - } - } - - @Override - public Result updateUser(User user) { - Integer i = userMapper.updateById(user); - if (i>0){ - return Result.success(i,"更新成功"); - }else{ - return Result.error("更新失败"); - } - } - - @Override - public Result deleteUser(User user) { - Integer i = userMapper.deleteById(user); - if (i>0){ - return Result.success(i,"删除成功"); - }else { - return Result.error("删除失败"); - } - } - - @Override - public Result getAllUserByCon(UserSearch userSearch) { - QueryWrapper wrapper = new QueryWrapper<>(); - if (userSearch.getBlur()!=null && !userSearch.getBlur().equals("")){ - wrapper.like("user_name",userSearch.getBlur()); - } - List list = userMapper.selectList(wrapper); - return Result.success(list); - } -} diff --git a/cloud-mart-server/src/main/resources/mapper/ConnectorMappers.xml b/cloud-mart-server/src/main/resources/mapper/ConnectorMappers.xml index 648b5bb..2f39015 100644 --- a/cloud-mart-server/src/main/resources/mapper/ConnectorMappers.xml +++ b/cloud-mart-server/src/main/resources/mapper/ConnectorMappers.xml @@ -3,6 +3,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + update connector set connector_name=#{connectorName},connector_describe=#{connectorDescribe},connector_picture=#{connectorPicture},connector_company=#{connectorCompany},connector_time=#{connectorTime},connector_residue_degree=#{connectorResidueDegree},connector_frequency=#{connectorFrequency},connector_status=#{connectorStatus} where connector_id=#{connectorId} +