diff --git a/user-client/src/main/java/com/hp/user/client/entity/AccountVO.java b/user-client/src/main/java/com/hp/user/client/entity/AccountVO.java index 5512161..5beba54 100644 --- a/user-client/src/main/java/com/hp/user/client/entity/AccountVO.java +++ b/user-client/src/main/java/com/hp/user/client/entity/AccountVO.java @@ -16,7 +16,7 @@ public class AccountVO{ /** * 用户Id */ - private Long userId; + private String userId; /** * 用户名 */ @@ -36,7 +36,7 @@ public class AccountVO{ /** * 创建用户Id */ - private Long sysCreator; + private String sysCreator; /** * 更新时间 */ @@ -44,12 +44,12 @@ public class AccountVO{ /** * 更新用户Id */ - private Long sysUpdater; + private String sysUpdater; public AccountVO(){} - public AccountVO(Long userId, String userName, String wxNumber, String phone, Date sysCreateTime, Long sysCreator, Date sysUpdateTime, Long sysUpdater) { + public AccountVO(String userId, String userName, String wxNumber, String phone, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) { this.userId = userId; this.userName = userName; this.wxNumber = wxNumber; @@ -60,11 +60,11 @@ public class AccountVO{ this.sysUpdater = sysUpdater; } - public Long getUserId() { + public String getUserId() { return userId; } - public void setUserId(Long userId) { + public void setUserId(String userId) { this.userId = userId; } @@ -100,11 +100,11 @@ public class AccountVO{ this.sysCreateTime = sysCreateTime; } - public Long getSysCreator() { + public String getSysCreator() { return sysCreator; } - public void setSysCreator(Long sysCreator) { + public void setSysCreator(String sysCreator) { this.sysCreator = sysCreator; } @@ -116,11 +116,11 @@ public class AccountVO{ this.sysUpdateTime = sysUpdateTime; } - public Long getSysUpdater() { + public String getSysUpdater() { return sysUpdater; } - public void setSysUpdater(Long sysUpdater) { + public void setSysUpdater(String sysUpdater) { this.sysUpdater = sysUpdater; } } diff --git a/user-client/src/main/java/com/hp/user/client/entity/AddressVO.java b/user-client/src/main/java/com/hp/user/client/entity/AddressVO.java index 8bb09c0..731e1fa 100644 --- a/user-client/src/main/java/com/hp/user/client/entity/AddressVO.java +++ b/user-client/src/main/java/com/hp/user/client/entity/AddressVO.java @@ -17,11 +17,11 @@ public class AddressVO { /** * 地址Id */ - private Long addressId; + private String addressId; /** * 所属Id */ - private Long ownerId; + private String ownerId; /** * 地址 */ @@ -65,7 +65,7 @@ public class AddressVO { /** * 创建用户Id */ - private Long sysCreator; + private String sysCreator; /** * 更新时间 */ @@ -73,11 +73,11 @@ public class AddressVO { /** * 更新用户Id */ - private Long sysUpdater; + private String sysUpdater; public AddressVO(){} - public AddressVO(Long addressId, Long ownerId, String address, String provinceCode, String cityCode, String countCode, String streetCode, BigDecimal longitude, BigDecimal latitude, Short sysDefault, Short tag, Date sysCreateTime, Long sysCreator, Date sysUpdateTime, Long sysUpdater) { + public AddressVO(String addressId, String ownerId, String address, String provinceCode, String cityCode, String countCode, String streetCode, BigDecimal longitude, BigDecimal latitude, Short sysDefault, Short tag, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) { this.addressId = addressId; this.ownerId = ownerId; this.address = address; @@ -95,19 +95,19 @@ public class AddressVO { this.sysUpdater = sysUpdater; } - public Long getAddressId() { + public String getAddressId() { return addressId; } - public void setAddressId(Long addressId) { + public void setAddressId(String addressId) { this.addressId = addressId; } - public Long getOwnerId() { + public String getOwnerId() { return ownerId; } - public void setOwnerId(Long ownerId) { + public void setOwnerId(String ownerId) { this.ownerId = ownerId; } @@ -191,11 +191,11 @@ public class AddressVO { this.sysCreateTime = sysCreateTime; } - public Long getSysCreator() { + public String getSysCreator() { return sysCreator; } - public void setSysCreator(Long sysCreator) { + public void setSysCreator(String sysCreator) { this.sysCreator = sysCreator; } @@ -207,11 +207,11 @@ public class AddressVO { this.sysUpdateTime = sysUpdateTime; } - public Long getSysUpdater() { + public String getSysUpdater() { return sysUpdater; } - public void setSysUpdater(Long sysUpdater) { + public void setSysUpdater(String sysUpdater) { this.sysUpdater = sysUpdater; } } diff --git a/user-client/src/main/java/com/hp/user/client/entity/AreaVO.java b/user-client/src/main/java/com/hp/user/client/entity/AreaVO.java index 48d76f7..b3ddd70 100644 --- a/user-client/src/main/java/com/hp/user/client/entity/AreaVO.java +++ b/user-client/src/main/java/com/hp/user/client/entity/AreaVO.java @@ -13,7 +13,7 @@ public class AreaVO { /** * 地区Id */ - private Long id; + private String id; /** * 区划编码 */ @@ -45,7 +45,7 @@ public class AreaVO { public AreaVO(){} - public AreaVO(Long id, String code, String name, String parentCode, Short type, String longitude, String latitude, String capital) { + public AreaVO(String id, String code, String name, String parentCode, Short type, String longitude, String latitude, String capital) { this.id = id; this.code = code; this.name = name; @@ -56,11 +56,11 @@ public class AreaVO { this.capital = capital; } - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } diff --git a/user-client/src/main/java/com/hp/user/client/entity/BaseVO.java b/user-client/src/main/java/com/hp/user/client/entity/BaseVO.java deleted file mode 100644 index 6186340..0000000 --- a/user-client/src/main/java/com/hp/user/client/entity/BaseVO.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.hp.user.client.entity; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author 王怡静 - * @since 2020/11/19 - * 基础类 - */ -public class BaseVO { - /** - * 创建时间 - */ - private Date createTime; - /** - * 创建用户Id - */ - private Long createUserId; - /** - * 更新时间 - */ - private Date updateTime; - /** - * 更新用户Id - */ - private Long updateUserId; - - public BaseVO(){ - - } - public BaseVO(Date createTime, Long createUserId, Date updateTime, Long updateUserId) { - this.createTime = createTime; - this.createUserId = createUserId; - this.updateTime = updateTime; - this.updateUserId = updateUserId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Long getCreateUserId() { - return createUserId; - } - - public void setCreateUserId(Long createUserId) { - this.createUserId = createUserId; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public Long getUpdateUserId() { - return updateUserId; - } - - public void setUpdateUserId(Long updateUserId) { - this.updateUserId = updateUserId; - } -} diff --git a/user-client/src/main/java/com/hp/user/client/entity/CompanyPageVO.java b/user-client/src/main/java/com/hp/user/client/entity/CompanyPage.java similarity index 96% rename from user-client/src/main/java/com/hp/user/client/entity/CompanyPageVO.java rename to user-client/src/main/java/com/hp/user/client/entity/CompanyPage.java index 918c362..a852c13 100644 --- a/user-client/src/main/java/com/hp/user/client/entity/CompanyPageVO.java +++ b/user-client/src/main/java/com/hp/user/client/entity/CompanyPage.java @@ -2,7 +2,7 @@ package com.hp.user.client.entity; import java.util.List; -public class CompanyPageVO { +public class CompanyPage { private Long current; // 当前页 private Integer size; // 当前页size private Long total; //总条数 diff --git a/user-client/src/main/java/com/hp/user/client/entity/CustomerCompanyVO.java b/user-client/src/main/java/com/hp/user/client/entity/CustomerCompanyVO.java index 69c9b64..1c73950 100644 --- a/user-client/src/main/java/com/hp/user/client/entity/CustomerCompanyVO.java +++ b/user-client/src/main/java/com/hp/user/client/entity/CustomerCompanyVO.java @@ -15,7 +15,7 @@ public class CustomerCompanyVO { /** * 客户Id */ - private Long customerId; + private String customerId; /** * 企业名称 */ @@ -59,7 +59,7 @@ public class CustomerCompanyVO { /** * 创建用户Id */ - private Long sysCreator; + private String sysCreator; /** * 更新时间 */ @@ -67,11 +67,11 @@ public class CustomerCompanyVO { /** * 更新用户Id */ - private Long sysUpdater; + private String sysUpdater; public CustomerCompanyVO(){} - public CustomerCompanyVO(Long customerId, String name, Short type, Short industryCode, String longitude, String latitude, String enterpriseTaxNumber, String businessLicense, String businessContact, String phoneNumber, Date sysCreateTime, Long sysCreator, Date sysUpdateTime, Long sysUpdater) { + public CustomerCompanyVO(String customerId, String name, Short type, Short industryCode, String longitude, String latitude, String enterpriseTaxNumber, String businessLicense, String businessContact, String phoneNumber, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) { this.customerId = customerId; this.name = name; this.type = type; @@ -88,11 +88,11 @@ public class CustomerCompanyVO { this.sysUpdater = sysUpdater; } - public Long getCustomerId() { + public String getCustomerId() { return customerId; } - public void setCustomerId(Long customerId) { + public void setCustomerId(String customerId) { this.customerId = customerId; } @@ -176,11 +176,11 @@ public class CustomerCompanyVO { this.sysCreateTime = sysCreateTime; } - public Long getSysCreator() { + public String getSysCreator() { return sysCreator; } - public void setSysCreator(Long sysCreator) { + public void setSysCreator(String sysCreator) { this.sysCreator = sysCreator; } @@ -192,11 +192,11 @@ public class CustomerCompanyVO { this.sysUpdateTime = sysUpdateTime; } - public Long getSysUpdater() { + public String getSysUpdater() { return sysUpdater; } - public void setSysUpdater(Long sysUpdater) { + public void setSysUpdater(String sysUpdater) { this.sysUpdater = sysUpdater; } } diff --git a/user-client/src/main/java/com/hp/user/client/entity/CustomerServiceProviderEnterpriseVO.java b/user-client/src/main/java/com/hp/user/client/entity/CustomerServiceProviderEnterpriseVO.java index 1a45754..676c87e 100644 --- a/user-client/src/main/java/com/hp/user/client/entity/CustomerServiceProviderEnterpriseVO.java +++ b/user-client/src/main/java/com/hp/user/client/entity/CustomerServiceProviderEnterpriseVO.java @@ -13,32 +13,32 @@ public class CustomerServiceProviderEnterpriseVO { /** * 服务商Id */ - private Long serviceProviderId; + private String serviceProviderId; /** * 企业Id */ - private Long enterpriseId; + private String enterpriseId; private CustomerServiceProviderEnterpriseVO(){} - public CustomerServiceProviderEnterpriseVO(Long serviceProviderId, Long enterpriseId) { + public CustomerServiceProviderEnterpriseVO(String serviceProviderId, String enterpriseId) { this.serviceProviderId = serviceProviderId; this.enterpriseId = enterpriseId; } - public Long getServiceProviderId() { + public String getServiceProviderId() { return serviceProviderId; } - public void setServiceProviderId(Long serviceProviderId) { + public void setServiceProviderId(String serviceProviderId) { this.serviceProviderId = serviceProviderId; } - public Long getEnterpriseId() { + public String getEnterpriseId() { return enterpriseId; } - public void setEnterpriseId(Long enterpriseId) { + public void setEnterpriseId(String enterpriseId) { this.enterpriseId = enterpriseId; } } diff --git a/user-client/src/main/java/com/hp/user/client/entity/StationPage.java b/user-client/src/main/java/com/hp/user/client/entity/StationPage.java new file mode 100644 index 0000000..14f757f --- /dev/null +++ b/user-client/src/main/java/com/hp/user/client/entity/StationPage.java @@ -0,0 +1,42 @@ +package com.hp.user.client.entity; + +import java.util.List; + +public class StationPage { + private Long current; // 当前页 + private Integer size; // 当前页size + private Long total; //总条数 + private List stationList; + + public Long getCurrent() { + return current; + } + + public void setCurrent(Long current) { + this.current = current; + } + + public Integer getSize() { + return size; + } + + public void setSize(Integer size) { + this.size = size; + } + + public Long getTotal() { + return total; + } + + public void setTotal(Long total) { + this.total = total; + } + + public List getStationList() { + return stationList; + } + + public void setStationList(List stationList) { + this.stationList = stationList; + } +} diff --git a/user-client/src/main/java/com/hp/user/client/entity/StationVO.java b/user-client/src/main/java/com/hp/user/client/entity/StationVO.java index 62af3f2..bfa4ce6 100644 --- a/user-client/src/main/java/com/hp/user/client/entity/StationVO.java +++ b/user-client/src/main/java/com/hp/user/client/entity/StationVO.java @@ -15,7 +15,7 @@ public class StationVO { /** * 站点Id */ - private Long stationId; + private String stationId; /** * 站点名称 */ @@ -23,7 +23,7 @@ public class StationVO { /** * 企业Id */ - private Long enterpriseId; + private String enterpriseId; /** * 站点联系人 */ @@ -43,7 +43,7 @@ public class StationVO { /** * 创建用户Id */ - private Long sysCreator; + private String sysCreator; /** * 更新时间 */ @@ -51,11 +51,11 @@ public class StationVO { /** * 更新用户Id */ - private Long sysUpdater; + private String sysUpdater; public StationVO(){} - public StationVO(Long stationId, String name, Long enterpriseId, String stationContact, String phone, BigDecimal capacity, Date sysCreateTime, Long sysCreator, Date sysUpdateTime, Long sysUpdater) { + public StationVO(String stationId, String name, String enterpriseId, String stationContact, String phone, BigDecimal capacity, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) { this.stationId = stationId; this.name = name; this.enterpriseId = enterpriseId; @@ -68,11 +68,11 @@ public class StationVO { this.sysUpdater = sysUpdater; } - public Long getStationId() { + public String getStationId() { return stationId; } - public void setStationId(Long stationId) { + public void setStationId(String stationId) { this.stationId = stationId; } @@ -84,11 +84,11 @@ public class StationVO { this.name = name; } - public Long getEnterpriseId() { + public String getEnterpriseId() { return enterpriseId; } - public void setEnterpriseId(Long enterpriseId) { + public void setEnterpriseId(String enterpriseId) { this.enterpriseId = enterpriseId; } @@ -124,11 +124,11 @@ public class StationVO { this.sysCreateTime = sysCreateTime; } - public Long getSysCreator() { + public String getSysCreator() { return sysCreator; } - public void setSysCreator(Long sysCreator) { + public void setSysCreator(String sysCreator) { this.sysCreator = sysCreator; } @@ -140,11 +140,11 @@ public class StationVO { this.sysUpdateTime = sysUpdateTime; } - public Long getSysUpdater() { + public String getSysUpdater() { return sysUpdater; } - public void setSysUpdater(Long sysUpdater) { + public void setSysUpdater(String sysUpdater) { this.sysUpdater = sysUpdater; } } diff --git a/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java b/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java index 6f633b0..230582e 100644 --- a/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java +++ b/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java @@ -1,6 +1,6 @@ package com.hp.user.client.service; -import com.hp.user.client.entity.CompanyPageVO; +import com.hp.user.client.entity.CompanyPage; import com.hp.user.client.entity.CustomerCompanyVO; /** @@ -16,6 +16,6 @@ public interface CustomerCompanyService { public boolean delete(Long companyId); public boolean update(CustomerCompanyVO company); public CustomerCompanyVO queryCompanyByCompanyId(Long companyId); - public CompanyPageVO getCompanysPage(Long current, Integer size); - public CompanyPageVO queryCompanyspageByNameAndServiceAndStatus(String name,String serviceProviderName,Integer status,Long current, Integer size); + public CompanyPage getCompanysPage(Long current, Integer size); + public CompanyPage queryCompanysPageByNameAndServiceAndStatus(String name, String serviceProviderName, Integer status, Long current, Integer size); } diff --git a/user-client/src/main/java/com/hp/user/client/service/StationService.java b/user-client/src/main/java/com/hp/user/client/service/StationService.java index 9e933f9..c999631 100644 --- a/user-client/src/main/java/com/hp/user/client/service/StationService.java +++ b/user-client/src/main/java/com/hp/user/client/service/StationService.java @@ -1,5 +1,8 @@ package com.hp.user.client.service; +import com.hp.user.client.entity.StationPage; +import com.hp.user.client.entity.StationVO; + /** *

* 站点信息 服务类 @@ -9,5 +12,11 @@ package com.hp.user.client.service; * @since 2020-11-20 */ public interface StationService { + public boolean insert(StationVO station); + public boolean delete(Long stationId); + public boolean update(StationVO station); + public StationVO queryStationByStationId(Long stationId); + public StationVO queryStationByStationName(String name); + public StationPage getStationsPage(Long current, Integer size); } diff --git a/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java b/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java index da7d4d5..3c06fa4 100644 --- a/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java +++ b/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java @@ -1,7 +1,6 @@ package com.hp.user.service.controller; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; -import com.hp.user.client.entity.CompanyPageVO; +import com.hp.user.client.entity.CompanyPage; import com.hp.user.client.entity.CustomerCompanyVO; import com.hp.user.client.service.CustomerCompanyService; import com.hp.user.util.IdWorker; @@ -9,11 +8,8 @@ import com.hp.user.utils.HttpResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.*; -import java.util.List; - @Api(tags = "企业/服务商API接口") @RestController @RequestMapping("/company") @@ -29,7 +25,7 @@ public class CompanyController { @ApiOperation(value = "新增企业", notes = "新增企业", httpMethod = "POST") @PostMapping("/addCompany") public HttpResult addCompany(@RequestBody CustomerCompanyVO company){ - company.setCustomerId(IdWorker.generactorId()); + company.setCustomerId(IdWorker.generactorId().toString()); boolean flag=customerCompanyService.insert(company); if(flag) return HttpResult.success(company.getCustomerId()); else return HttpResult.fail(); @@ -76,11 +72,11 @@ public class CompanyController { * 分页查询所有企业信息 * @param current 要查询页数 * @param size 一页的行数 - * @return CompanyPageVO + * @return CompanyPage */ @ApiOperation(value="分页查询所有企业",notes="输入的current为要查询的页数，size为一页的行数，返回的total为总行数") @GetMapping("/queryAllCompanyByPage") - public CompanyPageVO queryAllCompanyByPage(@RequestParam Long current, @RequestParam Integer size){ + public CompanyPage queryAllCompanyByPage(@RequestParam Long current, @RequestParam Integer size){ return customerCompanyService.getCompanysPage(current,size); } @@ -91,40 +87,40 @@ public class CompanyController { * @param status 审核状态 * @param current 要查询页数 * @param size 一页的行数 - * @return CompanyPageVO + * @return CompanyPage */ @ApiOperation(value="根据企业姓名、关联服务商、审核状态分页查询企业",notes="若查询服务商，则只需要填name，serviceProviderName为空，status为0") @GetMapping("/queryCompanysPageByNameAndServiceProviderAndStatus") - public CompanyPageVO queryCompanysPageByNameAndServiceProviderAndStatus(String name,String serviceProviderName,@RequestParam Integer status,@RequestParam Long current,@RequestParam Integer size){ - return customerCompanyService.queryCompanyspageByNameAndServiceAndStatus(name,serviceProviderName,status,current,size); - } - - /** - * 查询某企业的所有用户 - * @param companyId 企业Id - */ - @GetMapping("/queryAllUserOfCompany") - public void queryAllUserOfCompany(String companyId){ - - } - - /** - * 关联某企业与某用户 - * @param companyId 企业Id - * @param userId 用户Id - */ - @GetMapping("/associateCompanyAndUser") - public void associateCompanyAndUser(String companyId,String userId){ - + public CompanyPage queryCompanysPageByNameAndServiceProviderAndStatus(String name, String serviceProviderName, @RequestParam Integer status, @RequestParam Long current, @RequestParam Integer size){ + return customerCompanyService.queryCompanysPageByNameAndServiceAndStatus(name,serviceProviderName,status,current,size); } - /** - * 解除某企业与某用户的关联 - * @param companyId 企业Id - * @param userId 用户Id - */ - @GetMapping("/dissociateCompanyAndUser") - public void dissociateCompanyAndUser(String companyId,String userId){ - - } +// /** +// * 查询某企业的所有用户 +// * @param companyId 企业Id +// */ +// @GetMapping("/queryAllUserOfCompany") +// public void queryAllUserOfCompany(String companyId){ +// +// } +// +// /** +// * 关联某企业与某用户 +// * @param companyId 企业Id +// * @param userId 用户Id +// */ +// @GetMapping("/associateCompanyAndUser") +// public void associateCompanyAndUser(String companyId,String userId){ +// +// } +// +// /** +// * 解除某企业与某用户的关联 +// * @param companyId 企业Id +// * @param userId 用户Id +// */ +// @GetMapping("/dissociateCompanyAndUser") +// public void dissociateCompanyAndUser(String companyId,String userId){ +// +// } } diff --git a/user-service/src/main/java/com/hp/user/service/controller/StationController.java b/user-service/src/main/java/com/hp/user/service/controller/StationController.java index d6b73e4..1fa1400 100644 --- a/user-service/src/main/java/com/hp/user/service/controller/StationController.java +++ b/user-service/src/main/java/com/hp/user/service/controller/StationController.java @@ -1,52 +1,96 @@ package com.hp.user.service.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.hp.user.client.entity.StationPage; +import com.hp.user.client.entity.StationVO; +import com.hp.user.client.service.StationService; +import com.hp.user.util.IdWorker; +import com.hp.user.utils.HttpResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +@Api(tags = "站点API接口") @RestController @RequestMapping("/station") public class StationController { + @Autowired + private StationService stationService; + /** * 添加站点 - * 需要站点信息 + * @param station 站点信息 + * @return HttpResult */ - @RequestMapping("/addStation") - public void addStation(){ - + @ApiOperation(value = "新增站点") + @PostMapping("/addStation") + public HttpResult addStation(@RequestBody StationVO station){ + station.setStationId(IdWorker.generactorId().toString()); + boolean flag=stationService.insert(station); + if(flag) return HttpResult.success(station.getStationId()); + else return HttpResult.fail(); } /** * 更新站点信息 - * 需要站点信息 + * @param station 站点信息 + * @return HttpResult */ - @RequestMapping("/updateStation") - public void updateStation(){ - + @ApiOperation(value = "更新站点信息") + @PostMapping("/updateStation") + public HttpResult updateStation(@RequestBody StationVO station){ + boolean flag=stationService.update(station); + if(flag) return HttpResult.success(); + else return HttpResult.fail(); } /** * 根据站点Id删除站点 * @param stationId 站点Id + * @return HttpResult */ - @RequestMapping("/deleteStationByStationId") - public void deleteStationByStationId(String stationId){ - + @ApiOperation(value = "删除站点") + @GetMapping("/deleteStationByStationId") + public HttpResult deleteStationByStationId(@RequestParam String stationId){ + boolean flag=stationService.delete(Long.parseLong(stationId)); + if(flag) return HttpResult.success(); + else return HttpResult.fail(); } /** * 根据站点Id查询某站点信息 * @param stationId 站点Id + * @return StationVO */ - @RequestMapping("/queryStationByStationId") - public void queryStationByStationId(String stationId){ + @ApiOperation(value = "根据站点Id查询某站点") + @GetMapping("/queryStationByStationId") + public StationVO queryStationByStationId(String stationId){ + return stationService.queryStationByStationId(Long.parseLong(stationId)); + } + /** + * 根据站点名称查询某站点信息 + * @param stationName 站点名称 + * @return StationVO + */ + @ApiOperation(value = "根据站点名称查询某站点") + @GetMapping("/queryStationByStationName") + public StationVO queryStationByStationName(String stationName){ + return stationService.queryStationByStationName(stationName); } /** * 查询所有站点信息 */ - @RequestMapping("/queryAllStation") - public void queryAllStation(){ - + /** + * 分页查询所有站点信息 + * @param current 要查询页数 + * @param size 一页的行数 + * @return StationPage + */ + @ApiOperation(value="分页查询所有站点",notes="输入的current为要查询的页数，size为一页的行数，返回的total为总行数") + @GetMapping("/queryAllStationByPage") + public StationPage queryAllStationByPage(@RequestParam Long current, @RequestParam Integer size){ + return stationService.getStationsPage(current,size); } } diff --git a/user-service/src/main/java/com/hp/user/service/entity/Account.java b/user-service/src/main/java/com/hp/user/service/entity/Account.java index 2325bcf..2dbcf7b 100644 --- a/user-service/src/main/java/com/hp/user/service/entity/Account.java +++ b/user-service/src/main/java/com/hp/user/service/entity/Account.java @@ -25,7 +25,7 @@ public class Account implements Serializable { * 用户Id */ @TableId(value = "user_id") - private Long userId; + private String userId; /** * 用户名 */ @@ -45,7 +45,7 @@ public class Account implements Serializable { /** * 创建用户Id */ - private Long sysCreator; + private String sysCreator; /** * 更新时间 */ @@ -53,11 +53,11 @@ public class Account implements Serializable { /** * 更新用户Id */ - private Long sysUpdater; + private String sysUpdater; public Account(){} - public Account(Long userId, String userName, String wxNumber, String phone, Date sysCreateTime, Long sysCreator, Date sysUpdateTime, Long sysUpdater) { + public Account(String userId, String userName, String wxNumber, String phone, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) { this.userId = userId; this.userName = userName; this.wxNumber = wxNumber; @@ -68,11 +68,11 @@ public class Account implements Serializable { this.sysUpdater = sysUpdater; } - public Long getUserId() { + public String getUserId() { return userId; } - public void setUserId(Long userId) { + public void setUserId(String userId) { this.userId = userId; } @@ -108,11 +108,11 @@ public class Account implements Serializable { this.sysCreateTime = sysCreateTime; } - public Long getSysCreator() { + public String getSysCreator() { return sysCreator; } - public void setSysCreator(Long sysCreator) { + public void setSysCreator(String sysCreator) { this.sysCreator = sysCreator; } @@ -124,11 +124,11 @@ public class Account implements Serializable { this.sysUpdateTime = sysUpdateTime; } - public Long getSysUpdater() { + public String getSysUpdater() { return sysUpdater; } - public void setSysUpdater(Long sysUpdater) { + public void setSysUpdater(String sysUpdater) { this.sysUpdater = sysUpdater; } } diff --git a/user-service/src/main/java/com/hp/user/service/entity/Address.java b/user-service/src/main/java/com/hp/user/service/entity/Address.java index d4acf2b..c1c36fc 100644 --- a/user-service/src/main/java/com/hp/user/service/entity/Address.java +++ b/user-service/src/main/java/com/hp/user/service/entity/Address.java @@ -26,11 +26,11 @@ public class Address implements Serializable { * 地址Id */ @TableId(value = "address_id") - private Long addressId; + private String addressId; /** * 所属Id */ - private Long ownerId; + private String ownerId; /** * 地址 */ @@ -74,7 +74,7 @@ public class Address implements Serializable { /** * 创建用户Id */ - private Long sysCreator; + private String sysCreator; /** * 更新时间 */ @@ -82,11 +82,11 @@ public class Address implements Serializable { /** * 更新用户Id */ - private Long sysUpdater; + private String sysUpdater; public Address(){} - public Address(Long addressId, Long ownerId, String address, String provinceCode, String cityCode, String countCode, String streetCode, BigDecimal longitude, BigDecimal latitude, Short sysDefault, Short tag, Date sysCreateTime, Long sysCreator, Date sysUpdateTime, Long sysUpdater) { + public Address(String addressId, String ownerId, String address, String provinceCode, String cityCode, String countCode, String streetCode, BigDecimal longitude, BigDecimal latitude, Short sysDefault, Short tag, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) { this.addressId = addressId; this.ownerId = ownerId; this.address = address; @@ -104,19 +104,19 @@ public class Address implements Serializable { this.sysUpdater = sysUpdater; } - public Long getAddressId() { + public String getAddressId() { return addressId; } - public void setAddressId(Long addressId) { + public void setAddressId(String addressId) { this.addressId = addressId; } - public Long getOwnerId() { + public String getOwnerId() { return ownerId; } - public void setOwnerId(Long ownerId) { + public void setOwnerId(String ownerId) { this.ownerId = ownerId; } @@ -200,11 +200,11 @@ public class Address implements Serializable { this.sysCreateTime = sysCreateTime; } - public Long getSysCreator() { + public String getSysCreator() { return sysCreator; } - public void setSysCreator(Long sysCreator) { + public void setSysCreator(String sysCreator) { this.sysCreator = sysCreator; } @@ -216,11 +216,11 @@ public class Address implements Serializable { this.sysUpdateTime = sysUpdateTime; } - public Long getSysUpdater() { + public String getSysUpdater() { return sysUpdater; } - public void setSysUpdater(Long sysUpdater) { + public void setSysUpdater(String sysUpdater) { this.sysUpdater = sysUpdater; } } diff --git a/user-service/src/main/java/com/hp/user/service/entity/Area.java b/user-service/src/main/java/com/hp/user/service/entity/Area.java index 3090f73..be1f373 100644 --- a/user-service/src/main/java/com/hp/user/service/entity/Area.java +++ b/user-service/src/main/java/com/hp/user/service/entity/Area.java @@ -22,7 +22,7 @@ public class Area implements Serializable { * 地区Id */ @TableId(value = "id") - private Long id; + private String id; /** * 区划编码 */ @@ -54,7 +54,7 @@ public class Area implements Serializable { public Area(){} - public Area(Long id, String code, String name, String parentCode, Short type, String longitude, String latitude, String capital) { + public Area(String id, String code, String name, String parentCode, Short type, String longitude, String latitude, String capital) { this.id = id; this.code = code; this.name = name; @@ -65,11 +65,11 @@ public class Area implements Serializable { this.capital = capital; } - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } diff --git a/user-service/src/main/java/com/hp/user/service/entity/Base.java b/user-service/src/main/java/com/hp/user/service/entity/Base.java deleted file mode 100644 index 3888b3c..0000000 --- a/user-service/src/main/java/com/hp/user/service/entity/Base.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hp.user.service.entity; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author 王怡静 - * @since 2020/11/19 - * 基础类 - */ -public class Base implements Serializable { - /** - * 创建时间 - */ - private Date sysCreateTime; - /** - * 创建用户Id - */ - private Long sysCreator; - /** - * 更新时间 - */ - private Date sysUpdateTime; - /** - * 更新用户Id - */ - private Long sysUpdater; - - public Base(){ - - } - - public Base(Date sysCreateTime, Long sysCreator, Date sysUpdateTime, Long syspdator) { - this.sysCreateTime = sysCreateTime; - this.sysCreator = sysCreator; - this.sysUpdateTime = sysUpdateTime; - this.sysUpdater = syspdator; - } - - public Date getSysCreateTime() { - return sysCreateTime; - } - - public void setSysCreateTime(Date sysCreateTime) { - this.sysCreateTime = sysCreateTime; - } - - public Long getSysCreator() { - return sysCreator; - } - - public void setSysCreator(Long sysCreator) { - this.sysCreator = sysCreator; - } - - public Date getSysUpdateTime() { - return sysUpdateTime; - } - - public void setSysUpdateTime(Date sysUpdateTime) { - this.sysUpdateTime = sysUpdateTime; - } - - public Long getSysUpdater() { - return sysUpdater; - } - - public void setSysUpdater(Long sysUpdater) { - this.sysUpdater = sysUpdater; - } -} diff --git a/user-service/src/main/java/com/hp/user/service/entity/CustomerCompany.java b/user-service/src/main/java/com/hp/user/service/entity/CustomerCompany.java index c16ab72..d63d376 100644 --- a/user-service/src/main/java/com/hp/user/service/entity/CustomerCompany.java +++ b/user-service/src/main/java/com/hp/user/service/entity/CustomerCompany.java @@ -24,7 +24,7 @@ public class CustomerCompany implements Serializable { * 客户Id */ @TableId(value = "customer_id") - private Long customerId; + private String customerId; /** * 企业名称 */ @@ -68,7 +68,7 @@ public class CustomerCompany implements Serializable { /** * 创建用户Id */ - private Long sysCreator; + private String sysCreator; /** * 更新时间 */ @@ -76,11 +76,11 @@ public class CustomerCompany implements Serializable { /** * 更新用户Id */ - private Long sysUpdater; + private String sysUpdater; public CustomerCompany(){} - public CustomerCompany(Long customerId, String name, Short type, Short industryCode, String longitude, String latitude, String enterpriseTaxNumber, String businessLicense, String businessContact, String phoneNumber, Date sysCreateTime, Long sysCreator, Date sysUpdateTime, Long sysUpdater) { + public CustomerCompany(String customerId, String name, Short type, Short industryCode, String longitude, String latitude, String enterpriseTaxNumber, String businessLicense, String businessContact, String phoneNumber, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) { this.customerId = customerId; this.name = name; this.type = type; @@ -97,11 +97,11 @@ public class CustomerCompany implements Serializable { this.sysUpdater = sysUpdater; } - public Long getCustomerId() { + public String getCustomerId() { return customerId; } - public void setCustomerId(Long customerId) { + public void setCustomerId(String customerId) { this.customerId = customerId; } @@ -185,11 +185,11 @@ public class CustomerCompany implements Serializable { this.sysCreateTime = sysCreateTime; } - public Long getSysCreator() { + public String getSysCreator() { return sysCreator; } - public void setSysCreator(Long sysCreator) { + public void setSysCreator(String sysCreator) { this.sysCreator = sysCreator; } @@ -201,11 +201,11 @@ public class CustomerCompany implements Serializable { this.sysUpdateTime = sysUpdateTime; } - public Long getSysUpdater() { + public String getSysUpdater() { return sysUpdater; } - public void setSysUpdater(Long sysUpdater) { + public void setSysUpdater(String sysUpdater) { this.sysUpdater = sysUpdater; } } diff --git a/user-service/src/main/java/com/hp/user/service/entity/CustomerServiceProviderEnterprise.java b/user-service/src/main/java/com/hp/user/service/entity/CustomerServiceProviderEnterprise.java index b18e553..cf89047 100644 --- a/user-service/src/main/java/com/hp/user/service/entity/CustomerServiceProviderEnterprise.java +++ b/user-service/src/main/java/com/hp/user/service/entity/CustomerServiceProviderEnterprise.java @@ -24,36 +24,45 @@ public class CustomerServiceProviderEnterprise implements Serializable { * Id */ @TableId(value = "id") - private Long Id; + private String Id; /** * 服务商Id */ - private Long serviceProviderId; + private String serviceProviderId; /** * 企业Id */ - private Long enterpriseId; + private String enterpriseId; private CustomerServiceProviderEnterprise(){} - public CustomerServiceProviderEnterprise(Long serviceProviderId, Long enterpriseId) { + public CustomerServiceProviderEnterprise(String id, String serviceProviderId, String enterpriseId) { + Id = id; this.serviceProviderId = serviceProviderId; this.enterpriseId = enterpriseId; } - public Long getServiceProviderId() { + public String getId() { + return Id; + } + + public void setId(String id) { + Id = id; + } + + public String getServiceProviderId() { return serviceProviderId; } - public void setServiceProviderId(Long serviceProviderId) { + public void setServiceProviderId(String serviceProviderId) { this.serviceProviderId = serviceProviderId; } - public Long getEnterpriseId() { + public String getEnterpriseId() { return enterpriseId; } - public void setEnterpriseId(Long enterpriseId) { + public void setEnterpriseId(String enterpriseId) { this.enterpriseId = enterpriseId; } } diff --git a/user-service/src/main/java/com/hp/user/service/entity/Station.java b/user-service/src/main/java/com/hp/user/service/entity/Station.java index d11befe..df5eac1 100644 --- a/user-service/src/main/java/com/hp/user/service/entity/Station.java +++ b/user-service/src/main/java/com/hp/user/service/entity/Station.java @@ -25,7 +25,7 @@ public class Station implements Serializable { * 站点Id */ @TableId(value = "station_id") - private Long stationId; + private String stationId; /** * 站点名称 */ @@ -33,7 +33,7 @@ public class Station implements Serializable { /** * 企业Id */ - private Long enterpriseId; + private String enterpriseId; /** * 站点联系人 */ @@ -54,7 +54,7 @@ public class Station implements Serializable { /** * 创建用户Id */ - private Long sysCreator; + private String sysCreator; /** * 更新时间 */ @@ -62,11 +62,11 @@ public class Station implements Serializable { /** * 更新用户Id */ - private Long sysUpdater; + private String sysUpdater; public Station(){} - public Station(Long stationId, String name, Long enterpriseId, String stationContact, String phone, BigDecimal capacity, Date sysCreateTime, Long sysCreator, Date sysUpdateTime, Long sysUpdater) { + public Station(String stationId, String name, String enterpriseId, String stationContact, String phone, BigDecimal capacity, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) { this.stationId = stationId; this.name = name; this.enterpriseId = enterpriseId; @@ -79,11 +79,11 @@ public class Station implements Serializable { this.sysUpdater = sysUpdater; } - public Long getStationId() { + public String getStationId() { return stationId; } - public void setStationId(Long stationId) { + public void setStationId(String stationId) { this.stationId = stationId; } @@ -95,11 +95,11 @@ public class Station implements Serializable { this.name = name; } - public Long getEnterpriseId() { + public String getEnterpriseId() { return enterpriseId; } - public void setEnterpriseId(Long enterpriseId) { + public void setEnterpriseId(String enterpriseId) { this.enterpriseId = enterpriseId; } @@ -135,11 +135,11 @@ public class Station implements Serializable { this.sysCreateTime = sysCreateTime; } - public Long getSysCreator() { + public String getSysCreator() { return sysCreator; } - public void setSysCreator(Long sysCreator) { + public void setSysCreator(String sysCreator) { this.sysCreator = sysCreator; } @@ -151,11 +151,11 @@ public class Station implements Serializable { this.sysUpdateTime = sysUpdateTime; } - public Long getSysUpdater() { + public String getSysUpdater() { return sysUpdater; } - public void setSysUpdater(Long sysUpdater) { + public void setSysUpdater(String sysUpdater) { this.sysUpdater = sysUpdater; } } diff --git a/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java b/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java index c17f5c1..784d06d 100644 --- a/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java +++ b/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java @@ -4,15 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hp.user.client.entity.AreaVO; -import com.hp.user.client.entity.CompanyPageVO; +import com.hp.user.client.entity.CompanyPage; import com.hp.user.client.entity.CustomerCompanyVO; import com.hp.user.client.service.CustomerCompanyService; -import com.hp.user.service.controller.CompanyController; import com.hp.user.service.dao.CustomerCompanyMapper; import com.hp.user.service.dao.CustomerServiceProviderEnterpriseMapper; import com.hp.user.service.entity.CustomerCompany; import com.hp.user.service.entity.CustomerServiceProviderEnterprise; +import com.hp.user.util.IdWorker; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -67,8 +66,8 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { } @Override - public CompanyPageVO getCompanysPage(Long current, Integer size) { - CompanyPageVO companyPageVO = new CompanyPageVO(); + public CompanyPage getCompanysPage(Long current, Integer size) { + CompanyPage companyPage = new CompanyPage(); List companyVOs=new ArrayList<>(); IPage page = new Page<>(current,size); QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -81,16 +80,16 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { BeanUtils.copyProperties(company,temp); companyVOs.add(temp); } - companyPageVO.setCompanyList(companyVOs); - companyPageVO.setTotal(page.getTotal()); - companyPageVO.setCurrent(current); - companyPageVO.setSize(size); - return companyPageVO; + companyPage.setCompanyList(companyVOs); + companyPage.setTotal(page.getTotal()); + companyPage.setCurrent(current); + companyPage.setSize(size); + return companyPage; } @Override - public CompanyPageVO queryCompanyspageByNameAndServiceAndStatus(String name, String serviceProviderName, Integer status,Long current, Integer size) { - CompanyPageVO companyPageVO = new CompanyPageVO(); + public CompanyPage queryCompanysPageByNameAndServiceAndStatus(String name, String serviceProviderName, Integer status, Long current, Integer size) { + CompanyPage companyPage = new CompanyPage(); List companyVOs=new ArrayList<>(); IPage page = new Page<>(current,size); QueryWrapper wrapper = new QueryWrapper<>(); @@ -99,12 +98,12 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { QueryWrapper queryWrapper = new QueryWrapper<>(); // 先查出服务商信息，再根据服务商Id与企业Id的对应情况查企业 queryWrapper.like("name",serviceProviderName); - Long serviceProviderId = customerCompanyMapper.selectOne(queryWrapper).getCustomerId(); + String serviceProviderId = customerCompanyMapper.selectOne(queryWrapper).getCustomerId(); //根据服务商Id与企业Id的对应情况查企业Id QueryWrapper tempWrapper = new QueryWrapper<>(); tempWrapper.eq("service_provider_id",serviceProviderId); List temp = customerServiceProviderEnterpriseMapper.selectList(tempWrapper); - List companyIds =new ArrayList<>(); + List companyIds =new ArrayList<>(); for(CustomerServiceProviderEnterprise tt:temp){ companyIds.add(tt.getEnterpriseId()); } @@ -125,10 +124,10 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { BeanUtils.copyProperties(company,t); companyVOs.add(t); } - companyPageVO.setCompanyList(companyVOs); - companyPageVO.setTotal(page.getTotal()); - companyPageVO.setCurrent(current); - companyPageVO.setSize(size); - return companyPageVO; + companyPage.setCompanyList(companyVOs); + companyPage.setTotal(page.getTotal()); + companyPage.setCurrent(current); + companyPage.setSize(size); + return companyPage; } } diff --git a/user-service/src/main/java/com/hp/user/service/impl/StationServiceImpl.java b/user-service/src/main/java/com/hp/user/service/impl/StationServiceImpl.java index 15ae62a..2386e02 100644 --- a/user-service/src/main/java/com/hp/user/service/impl/StationServiceImpl.java +++ b/user-service/src/main/java/com/hp/user/service/impl/StationServiceImpl.java @@ -1,8 +1,22 @@ package com.hp.user.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; +import com.hp.user.client.entity.StationPage; +import com.hp.user.client.entity.StationVO; import com.hp.user.client.service.StationService; +import com.hp.user.service.dao.StationMapper; +import com.hp.user.service.entity.Station; +import com.hp.user.util.IdWorker; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** *

* 站点信息 服务实现类 @@ -13,5 +27,67 @@ import org.springframework.stereotype.Service; */ @Service public class StationServiceImpl implements StationService { + @Autowired + private StationMapper stationMapper; + @Override + public boolean insert(StationVO station) { + Station temp=new Station(); + BeanUtils.copyProperties(station,temp); + // 判断数据库操作是否成功 + return SqlHelper.retBool(stationMapper.insert(temp)); + } + + @Override + public boolean delete(Long stationId) { + // 判断数据库操作是否成功 + return SqlHelper.retBool(stationMapper.deleteById(stationId)); + } + + @Override + public boolean update(StationVO station) { + Station temp=new Station(); + BeanUtils.copyProperties(station,temp); + // 判断数据库操作是否成功 + return SqlHelper.retBool(stationMapper.updateById(temp)); + } + + @Override + public StationVO queryStationByStationId(Long stationId) { + StationVO stationVO = new StationVO(); + Station temp=stationMapper.selectById(stationId); + BeanUtils.copyProperties(temp,stationVO); + return stationVO; + } + + @Override + public StationVO queryStationByStationName(String name) { + StationVO stationVO = new StationVO(); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.like("name",name); + Station station = stationMapper.selectOne(wrapper); + BeanUtils.copyProperties(station,stationVO); + return stationVO; + } + @Override + public StationPage getStationsPage(Long current, Integer size) { + StationPage stationPage = new StationPage(); + List stationVOList = new ArrayList<>(); + IPage page = new Page<>(current,size); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.orderByDesc("sys_create_time"); + stationMapper.selectPage(page,wrapper); + List stations = page.getRecords(); + StationVO temp; + for(Station station:stations){ + temp=new StationVO(); + BeanUtils.copyProperties(station,temp); + stationVOList.add(temp); + } + stationPage.setStationList(stationVOList); + stationPage.setTotal(page.getTotal()); + stationPage.setCurrent(current); + stationPage.setSize(size); + return stationPage; + } }