Skip to content

涂亚平 / laowu

Go to a project
Commit 85f1a48e by 涂亚平
Options

导数据前版本备份

1 parent 461bd570
Expand all
Inline Side-by-side
Showing with 2343 additions and 58 deletions
logs/springboot-logback-error.log
2023-04-12 14:01:43,192 [http-nio-34567-exec-8] ERROR com.laowu.common.exception.GlobalExceptionHandler:88 - JSON parse error: Cannot deserialize value of type `java.lang.Long` from String "上海市": not a valid Long value; nested exception is com.fasterxml.jackson.databind.exc.InvalidFormatException: Cannot deserialize value of type `java.lang.Long` from String "上海市": not a valid Long value
at [Source: (PushbackInputStream); line: 1, column: 78] (through reference chain: com.laowu.dto.company.StationCompanyDTO["stationId"])
2023-04-12 14:02:03,502 [http-nio-34567-exec-8] ERROR com.laowu.common.exception.GlobalExceptionHandler:88 - JSON parse error: Cannot deserialize value of type `java.lang.Long` from String "上海市": not a valid Long value; nested exception is com.fasterxml.jackson.databind.exc.InvalidFormatException: Cannot deserialize value of type `java.lang.Long` from String "上海市": not a valid Long value
at [Source: (PushbackInputStream); line: 1, column: 78] (through reference chain: com.laowu.dto.company.StationCompanyDTO["stationId"])
2023-05-22 09:54:53,188 [http-nio-34567-exec-2] ERROR com.laowu.common.exception.GlobalExceptionHandler:88 - JSON parse error: Cannot deserialize instance of `java.lang.String` out of START_ARRAY token; nested exception is com.fasterxml.jackson.databind.exc.MismatchedInputException: Cannot deserialize instance of `java.lang.String` out of START_ARRAY token
at [Source: (PushbackInputStream); line: 2, column: 16] (through reference chain: com.laowu.model.MemberDictDO["userName"])
2023-05-22 09:56:25,376 [http-nio-34567-exec-5] ERROR com.laowu.common.exception.GlobalExceptionHandler:88 - JSON parse error: Illegal unquoted character ((CTRL-CHAR, code 13)): has to be escaped using backslash to be included in string value; nested exception is com.fasterxml.jackson.databind.JsonMappingException: Illegal unquoted character ((CTRL-CHAR, code 13)): has to be escaped using backslash to be included in string value
at [Source: (PushbackInputStream); line: 2, column: 16] (through reference chain: com.laowu.model.MemberDictDO["userName"])
2023-05-22 09:56:54,840 [http-nio-34567-exec-8] ERROR com.laowu.common.exception.GlobalExceptionHandler:88 - JSON parse error: Cannot deserialize instance of `java.lang.String` out of START_ARRAY token; nested exception is com.fasterxml.jackson.databind.exc.MismatchedInputException: Cannot deserialize instance of `java.lang.String` out of START_ARRAY token
at [Source: (PushbackInputStream); line: 2, column: 16] (through reference chain: com.laowu.model.MemberDictDO["userName"])
2023-07-06 16:53:26,161 [main] ERROR org.apache.catalina.util.LifecycleBase:175 - Failed to start component [Connector[HTTP/1.1-34567]]
org.apache.catalina.LifecycleException: Protocol handler start failed
at org.apache.catalina.connector.Connector.startInternal(Connector.java:1008)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183)
at org.apache.catalina.core.StandardService.addConnector(StandardService.java:227)
at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.addPreviouslyRemovedConnectors(TomcatWebServer.java:263)
at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.start(TomcatWebServer.java:195)
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.startWebServer(ServletWebServerApplicationContext.java:297)
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.finishRefresh(ServletWebServerApplicationContext.java:163)
at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:552)
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:141)
at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:743)
at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:390)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:312)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1214)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1203)
at com.laowu.LaowuApplication.main(LaowuApplication.java:14)
Caused by: java.net.BindException: Address already in use: bind
at sun.nio.ch.Net.bind0(Native Method)
at sun.nio.ch.Net.bind(Net.java:433)
at sun.nio.ch.Net.bind(Net.java:425)
at sun.nio.ch.ServerSocketChannelImpl.bind(ServerSocketChannelImpl.java:223)
at sun.nio.ch.ServerSocketAdaptor.bind(ServerSocketAdaptor.java:74)
at org.apache.tomcat.util.net.NioEndpoint.initServerSocket(NioEndpoint.java:230)
at org.apache.tomcat.util.net.NioEndpoint.bind(NioEndpoint.java:213)
at org.apache.tomcat.util.net.AbstractEndpoint.bindWithCleanup(AbstractEndpoint.java:1124)
at org.apache.tomcat.util.net.AbstractEndpoint.start(AbstractEndpoint.java:1210)
at org.apache.coyote.AbstractProtocol.start(AbstractProtocol.java:585)
at org.apache.catalina.connector.Connector.startInternal(Connector.java:1005)
... 14 common frames omitted
2023-07-06 16:53:26,184 [main] ERROR org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter:40 -
***************************
APPLICATION FAILED TO START
***************************
Description:
The Tomcat connector configured to listen on port 34567 failed to start. The port may already be in use or the connector may be misconfigured.
Action:
Verify the connector's configuration, identify and stop any process that's listening on port 34567, or configure this application to listen on another port.
2023-07-06 17:05:55,745 [main] ERROR org.apache.catalina.util.LifecycleBase:175 - Failed to start component [Connector[HTTP/1.1-34567]]
org.apache.catalina.LifecycleException: Protocol handler start failed
at org.apache.catalina.connector.Connector.startInternal(Connector.java:1008)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183)
at org.apache.catalina.core.StandardService.addConnector(StandardService.java:227)
at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.addPreviouslyRemovedConnectors(TomcatWebServer.java:263)
at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.start(TomcatWebServer.java:195)
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.startWebServer(ServletWebServerApplicationContext.java:297)
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.finishRefresh(ServletWebServerApplicationContext.java:163)
at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:552)
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:141)
at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:743)
at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:390)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:312)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1214)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1203)
at com.laowu.LaowuApplication.main(LaowuApplication.java:14)
Caused by: java.net.BindException: Address already in use: bind
at sun.nio.ch.Net.bind0(Native Method)
at sun.nio.ch.Net.bind(Net.java:433)
at sun.nio.ch.Net.bind(Net.java:425)
at sun.nio.ch.ServerSocketChannelImpl.bind(ServerSocketChannelImpl.java:223)
at sun.nio.ch.ServerSocketAdaptor.bind(ServerSocketAdaptor.java:74)
at org.apache.tomcat.util.net.NioEndpoint.initServerSocket(NioEndpoint.java:230)
at org.apache.tomcat.util.net.NioEndpoint.bind(NioEndpoint.java:213)
at org.apache.tomcat.util.net.AbstractEndpoint.bindWithCleanup(AbstractEndpoint.java:1124)
at org.apache.tomcat.util.net.AbstractEndpoint.start(AbstractEndpoint.java:1210)
at org.apache.coyote.AbstractProtocol.start(AbstractProtocol.java:585)
at org.apache.catalina.connector.Connector.startInternal(Connector.java:1005)
... 14 common frames omitted
2023-07-06 17:05:55,766 [main] ERROR org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter:40 -
***************************
APPLICATION FAILED TO START
***************************
Description:
The Tomcat connector configured to listen on port 34567 failed to start. The port may already be in use or the connector may be misconfigured.
Action:
Verify the connector's configuration, identify and stop any process that's listening on port 34567, or configure this application to listen on another port.
src/main/java/com/laowu/controller/AdministerStationRoleController.java 0 → 100644
package com.laowu.controller;
import com.laowu.dto.administer.AddAdministerRoleDTO;
import com.laowu.dto.geo.WorkstationRoleGeosDTO;
import com.laowu.dto.station.UpdateAdministerRoleDTO;
import com.laowu.model.AdministerStationRoleDO;
import com.laowu.service.AdministerStationRoleService;
import com.laowu.util.ResponseData;
import com.laowu.util.ResponseVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 管理员-管理区域表 前端控制器
* </p>
*
* @author Tuyp
* @since 2023-06-19
*/
@RestController
@Api(tags = "管理员-管理区域表")
@RequestMapping("/administerStationRole")
public class AdministerStationRoleController {
@Autowired
private AdministerStationRoleService administerStationRoleService;
@PostMapping("workstationRoleGeos")
@ApiOperation("查看工作站下管理员所属的管理区域 workstationId roleId province city county town village")
public ResponseVO workstationRoleGeos(@RequestBody WorkstationRoleGeosDTO workstationRoleGeosDTO) {
return ResponseData.generateCreatedResponse(0, administerStationRoleService.workstationRoleGeos(workstationRoleGeosDTO));
}
@PostMapping("deleteAdministerRole")
@ApiOperation("删除管理员角色 workstationId roleId administerId")
public ResponseVO deleteAdministerRole(@RequestBody AdministerStationRoleDO administerStationRoleDO) {
return ResponseData.generateCreatedResponse(0, administerStationRoleService.deleteAdministerRole(administerStationRoleDO));
}
@PostMapping("addAdministerRole")
@ApiOperation("添加账户 workstationId userName roleId telephone geos[province city county town village] ")
public ResponseVO addAdministerRole(@RequestBody AddAdministerRoleDTO addAdministerRoleDTO) {
return ResponseData.generateCreatedResponse(0, administerStationRoleService.addAdministerRole(addAdministerRoleDTO));
}
@PostMapping("deleteAdministerRoleGeo")
@ApiOperation("删除管理员的某个管理区域 id ")
public ResponseVO deleteAdministerRoleGeo(@RequestBody AdministerStationRoleDO administerStationRoleDO) {
return ResponseData.generateCreatedResponse(0, administerStationRoleService.deleteAdministerRoleGeo(administerStationRoleDO));
}
@PostMapping("administerStations")
@ApiOperation("查看某个用户所涉及的工作站 administerId")
public ResponseVO administerStations(@RequestBody AdministerStationRoleDO administerStationRoleDO){
return ResponseData.generateCreatedResponse(0,administerStationRoleService.administerStations(administerStationRoleDO));
}
@PostMapping("updateAdministerRole")
@ApiOperation("编辑账户 administerId telephone userName geos[province city county town village] ")
public ResponseVO updateAdministerRole(@RequestBody UpdateAdministerRoleDTO updateAdministerRoleDTO ){
return ResponseData.generateCreatedResponse(0,administerStationRoleService.updateAdministerRole(updateAdministerRoleDTO));
}
}
src/main/java/com/laowu/controller/CompanyDictController.java
......@@ -47,13 +47,13 @@ public class CompanyDictController {
}
@PostMapping("addCompany")
@ApiOperation("添加企业 userId module 模块 companyName companyLogo province city county businessId companyCode account companyDesc companyOrigin companyPhotoDOS[ photo] companyLabelDOS[ label] 关联业务 stationId")
@ApiOperation("添加企业 userId module 模块 companyName companyProperty companyLogo province city county businessId companyCode account companyDesc companyOrigin companyPhotoDOS[ photo] companyLabelDOS[ label] 关联业务 stationId")
public ResponseVO addCompany(@RequestBody AddCompanyDTO addCompanyDTO){
return ResponseData.generateCreatedResponse(0,companyDictService.addCompany(addCompanyDTO));
}
@PostMapping("updateCompany")
@ApiOperation("更新企业 userId module id companyName companyLogo province city county businessId companyCode account companyDesc companyOrigin companyPhotoDOS[ photo] companyLabelDOS[ label] 关联业务 stationId")
@ApiOperation("更新企业 userId module id companyName companyLogo companyProperty province city county businessId companyCode account companyDesc companyOrigin companyPhotoDOS[ photo] companyLabelDOS[ label] 关联业务 stationId")
public ResponseVO updateCompany(@RequestBody AddCompanyDTO addCompanyDTO){
return ResponseData.generateCreatedResponse(0,companyDictService.updateCompany(addCompanyDTO));
}
......@@ -76,4 +76,10 @@ public class CompanyDictController {
return ResponseData.generateCreatedResponse(0,companyDictService.stationCompany(stationCompanyDTO));
}
@PostMapping("companyCard")
@ApiOperation("公司名片 id 公司id")
public ResponseVO companyCard(@RequestBody CompanyDictDO companyDictDO){
return ResponseData.generateCreatedResponse(0,companyDictService.companyCard(companyDictDO));
}
}
src/main/java/com/laowu/controller/LibGeoLocationController.java
......@@ -2,6 +2,7 @@ package com.laowu.controller;
import com.laowu.dto.geo.AllGeosDTO;
import com.laowu.dto.geo.LocalGeoMembersDTO;
import com.laowu.model.LibGeoLocationDO;
import com.laowu.service.LibGeoLocationService;
import com.laowu.util.ResponseData;
......@@ -31,26 +32,44 @@ public class LibGeoLocationController {
private LibGeoLocationService libGeoLocationService;
@PostMapping("provinces")
@ApiOperation("查询所有的省")
@ApiOperation("查询所有的省市县")
public ResponseVO provinces(){
return ResponseData.generateCreatedResponse(0,libGeoLocationService.provinces());
}
// @PostMapping("cities")
// @ApiOperation("通过省去查所有市 province")
// public ResponseVO cities(@RequestBody LibGeoLocationDO libGeoLocationDO){
// return ResponseData.generateCreatedResponse(0,libGeoLocationService.cities(libGeoLocationDO));
// }
//
// @PostMapping("county")
// @ApiOperation("通过省、市去查所有县 province,city")
// public ResponseVO county(@RequestBody LibGeoLocationDO libGeoLocationDO){
// return ResponseData.generateCreatedResponse(0,libGeoLocationService.county(libGeoLocationDO));
// }
@PostMapping("province")
@ApiOperation("查询所有省")
public ResponseVO province(){
return ResponseData.generateCreatedResponse(0,libGeoLocationService.province());
}
@PostMapping("cities")
@ApiOperation("通过省去查所有市 province")
public ResponseVO cities(@RequestBody LibGeoLocationDO libGeoLocationDO){
return ResponseData.generateCreatedResponse(0,libGeoLocationService.cities(libGeoLocationDO));
}
@PostMapping("county")
@ApiOperation("通过省、市去查所有县 province,city")
public ResponseVO county(@RequestBody LibGeoLocationDO libGeoLocationDO){
return ResponseData.generateCreatedResponse(0,libGeoLocationService.county(libGeoLocationDO));
}
@PostMapping("town")
@ApiOperation("通过省市县去查所有镇")
public ResponseVO town(@RequestBody LibGeoLocationDO libGeoLocationDO){
return ResponseData.generateCreatedResponse(0,libGeoLocationService.town(libGeoLocationDO));
}
@PostMapping("village")
@ApiOperation("通过省市县去查所有镇 province city county town")
public ResponseVO village(@RequestBody LibGeoLocationDO libGeoLocationDO){
return ResponseData.generateCreatedResponse(0,libGeoLocationService.village(libGeoLocationDO));
}
@PostMapping("villages")
@ApiOperation("通过省市县镇 查村 province city county town")
public ResponseVO village(@RequestBody LibGeoLocationDO libGeoLocationDO){
public ResponseVO villages(@RequestBody LibGeoLocationDO libGeoLocationDO){
return ResponseData.generateCreatedResponse(0,libGeoLocationService.villages(libGeoLocationDO));
}
......@@ -78,4 +97,19 @@ public class LibGeoLocationController {
return ResponseData.generateCreatedResponse(0,libGeoLocationService.deleteGeo(libGeoLocationDO));
}
// @PostMapping("localVillages")
// @ApiOperation("通过省市查看本地县-镇-村 province city")
// public ResponseVO localVillages(@RequestBody LibGeoLocationDO libGeoLocationDO){
// return ResponseData.generateCreatedResponse(0,libGeoLocationService.localVillages(libGeoLocationDO));
// }
@PostMapping("localGeoMembers")
@ApiOperation("数据普查区域 workstationId county town village")
public ResponseVO localGeoMembers(@RequestBody LocalGeoMembersDTO localGeoMembersDTO){
return ResponseData.generateCreatedResponse(0,libGeoLocationService.localGeoMembers(localGeoMembersDTO));
}
}
src/main/java/com/laowu/controller/MemberDictController.java
package com.laowu.controller;
import com.laowu.dto.member.AddMemberDTO;
import com.laowu.dto.member.AllMembersDTO;
import com.laowu.dto.member.UpdateMemberDTO;
import com.laowu.dto.member.*;
import com.laowu.model.MemberDictDO;
import com.laowu.service.MemberDictService;
import com.laowu.util.ResponseData;
......@@ -11,10 +9,10 @@ import com.laowu.util.ResponseVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
* <p>
......@@ -33,7 +31,7 @@ public class MemberDictController {
private MemberDictService memberDictService;
@PostMapping("allMembers")
@ApiOperation("查询所有自然人 pageSize pageNum province city county status userName")
@ApiOperation("查询所有自然人 pageSize pageNum province city county status userName positionId")
public ResponseVO allMembers(@RequestBody AllMembersDTO allMembersDTO){
return ResponseData.generateCreatedResponse(0,memberDictService.allMembers(allMembersDTO));
}
......@@ -64,6 +62,36 @@ public class MemberDictController {
return ResponseData.generateCreatedResponse(0,memberDictService.updateMember(updateMemberDTO));
}
@PostMapping("memberCard")
@ApiOperation("自然人名片 id")
public ResponseVO memberCard(@RequestBody MemberDictDO memberDictDO){
return ResponseData.generateCreatedResponse(0,memberDictService.memberCard(memberDictDO));
}
@PostMapping("importUsers")
@ApiOperation("导入用户 workstationId teamId file")
public ResponseVO importUsers(@RequestParam("workstationId") String workstationId,@RequestParam("teamId") String teamId,@RequestParam("file") MultipartFile file){
return ResponseData.generateCreatedResponse(0,memberDictService.importMember(workstationId,teamId,file));
}
@PostMapping("downloadErrorData")
@ApiOperation("下载错误数据 importMemberVOS[index userName idCard province city county address telephone major education isPoor isMigration isParty failReason ]")
public ResponseVO downloadErrorData(@RequestBody DownloadErrorDataDTO downloadErrorDataDTO){
return ResponseData.generateCreatedResponse(0,memberDictService.downloadErrorData(downloadErrorDataDTO));
}
@PostMapping("address")
@ApiOperation("地址 导入省市县镇")
public void address (@RequestBody List<AddressDTO> addressDTO){
memberDictService.address(addressDTO);
}
@PostMapping("roster")
@ApiOperation("花名册 pageSize pageNum province city county ")
public ResponseVO roster(@RequestBody RosterDTO rosterDTO){
return ResponseData.generateCreatedResponse(0,memberDictService.roster(rosterDTO));
}
}
src/main/java/com/laowu/controller/NewsDictController.java 0 → 100644
package com.laowu.controller;
import com.laowu.dto.label.AddNewsDTO;
import com.laowu.dto.label.NewsDTO;
import com.laowu.model.NewsDictDO;
import com.laowu.service.NewsDictService;
import com.laowu.util.ResponseData;
import com.laowu.util.ResponseVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* <p>
* 前端控制器
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@RestController
@Api(tags = "新闻字典表")
@RequestMapping("/newsDict")
public class NewsDictController {
@Autowired
private NewsDictService newsDictService;
@PostMapping("news")
@ApiOperation("查看所有新闻 pageSize pageNum title labelId")
public ResponseVO news(@RequestBody NewsDTO newsDTO){
return ResponseData.generateCreatedResponse(0,newsDictService.news(newsDTO));
}
@PostMapping("top")
@ApiOperation("id 需要置顶的id")
public ResponseVO top(@RequestBody NewsDictDO newsDictDO){
return ResponseData.generateCreatedResponse(0,newsDictService.top(newsDictDO));
}
@PostMapping("deleteNews")
@ApiOperation("删除新闻 id 新闻id")
public ResponseVO deleteNews(@RequestBody NewsDictDO newsDictDO){
return ResponseData.generateCreatedResponse(0,newsDictService.deleteNews(newsDictDO));
}
@PostMapping("addNews")
@ApiOperation("新建新闻 labelIds[] title guiding status publishDate publishId content coverPage ")
public ResponseVO addNews(@RequestBody AddNewsDTO addNewsDTO){
return ResponseData.generateCreatedResponse(0,newsDictService.addNews(addNewsDTO));
}
@PostMapping("updateNews")
@ApiOperation(" 修改新闻 id labelIds[] title guiding status publishDate publishId content coverPage ")
public ResponseVO updateNews(@RequestBody AddNewsDTO updateNewsDTO){
return ResponseData.generateCreatedResponse(0,newsDictService.updateNews(updateNewsDTO));
}
@PostMapping("oneNews")
@ApiOperation("查看详情 id")
public ResponseVO oneNews(@RequestBody NewsDictDO newsDictDO){
return ResponseData.generateCreatedResponse(0,newsDictService.oneNews(newsDictDO));
}
@PostMapping("noTopNews")
@ApiOperation("除去置顶的新闻 pageSize pageNum title labelId ")
public ResponseVO noTopNews(@RequestBody NewsDTO newsDTO){
return ResponseData.generateCreatedResponse(0,newsDictService.noTopNews(newsDTO));
}
}
src/main/java/com/laowu/controller/NewsLabelDictController.java 0 → 100644
package com.laowu.controller;
import com.laowu.model.NewsLabelDictDO;
import com.laowu.service.NewsLabelDictService;
import com.laowu.util.ResponseData;
import com.laowu.util.ResponseVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@RestController
@Api(tags = "标签字典表")
@RequestMapping("/newsLabelDict")
public class NewsLabelDictController {
@Autowired
private NewsLabelDictService newsLabelDictService;
@PostMapping("addLabel")
@ApiOperation("添加标签 label createBy")
public ResponseVO addLabel(@RequestBody NewsLabelDictDO newsLabelDictDO){
return ResponseData.generateCreatedResponse(0,newsLabelDictService.addLabel(newsLabelDictDO));
}
@PostMapping("updateLabel")
@ApiOperation("修改标签 id label createBy")
public ResponseVO updateLabel(@RequestBody NewsLabelDictDO newsLabelDictDO){
return ResponseData.generateCreatedResponse(0,newsLabelDictService.updateLabel(newsLabelDictDO));
}
@PostMapping("deleteLabel")
@ApiOperation("删除标签 id")
public ResponseVO deleteLabel(@RequestBody NewsLabelDictDO newsLabelDictDO){
return ResponseData.generateCreatedResponse(0,newsLabelDictService.deleteLabel(newsLabelDictDO));
}
@PostMapping("lables")
@ApiOperation("查询标签 label")
public ResponseVO lables(@RequestBody NewsLabelDictDO newsLabelDictDO){
return ResponseData.generateCreatedResponse(0,newsLabelDictService.lables(newsLabelDictDO));
}
}
src/main/java/com/laowu/controller/NewsLabelsController.java 0 → 100644
package com.laowu.controller;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@RestController
@Api(tags = "")
@RequestMapping("/newsLabels")
public class NewsLabelsController {
}
src/main/java/com/laowu/controller/RoleDictController.java
package com.laowu.controller;
import com.laowu.dto.role.UpdatePermissionsDTO;
import com.laowu.service.RoleDictService;
import com.laowu.util.ResponseData;
import com.laowu.util.ResponseVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
......@@ -16,7 +23,30 @@ import io.swagger.annotations.Api;
*/
@RestController
@Api(tags = "角色表")
@RequestMapping("/role-dict-do")
@RequestMapping("/roleDict")
public class RoleDictController {
@Autowired
private RoleDictService roleDictService;
@PostMapping("/workstationRoles")
@ApiOperation("查看工作站的所有角色")
public ResponseVO workstationRoles(){
return ResponseData.generateCreatedResponse(0,roleDictService.workstationRoles());
}
@PostMapping("allPermissions")
@ApiOperation("查看所有权限")
public ResponseVO allPermissions(){
return ResponseData.generateCreatedResponse(0,roleDictService.allPermissions());
}
@PostMapping("updatePermissions")
@ApiOperation("修改权限 roleId permissions[] 新的权限列表 ")
public ResponseVO updatePermissions(@RequestBody UpdatePermissionsDTO updatePermissionsDTO){
return ResponseData.generateCreatedResponse(0,roleDictService.updatePermissions(updatePermissionsDTO));
}
}
src/main/java/com/laowu/controller/TeamDictController.java
......@@ -103,7 +103,7 @@ public class TeamDictController {
}
@PostMapping("memberManagement")
@ApiOperation("人员管理 pageSize pageNum userId teamId stationId province jobStatus userName")
@ApiOperation("人员管理 pageSize pageNum userId teamId stationId province jobStatus userName positionId 技能范围")
public ResponseVO memberManagement (@RequestBody MemberManagementDTO memberManagementDTO){
return ResponseData.generateCreatedResponse(0,teamDictService.memberManagement(memberManagementDTO));
}
......
src/main/java/com/laowu/controller/WorkstationDictController.java
......@@ -94,5 +94,4 @@ public class WorkstationDictController {
return ResponseData.generateCreatedResponse(0,workstationDictService.homepage(workstationDictDO));
}
}
src/main/java/com/laowu/controller/WorkstationOutsideGeoController.java 0 → 100644
package com.laowu.controller;
import com.laowu.model.WorkstationOutsideGeoDO;
import com.laowu.service.WorkstationOutsideGeoService;
import com.laowu.util.ResponseData;
import com.laowu.util.ResponseVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 驻外区域字典表 前端控制器
* </p>
*
* @author Tuyp
* @since 2023-06-16
*/
@RestController
@Api(tags = "就业服务区域字典表")
@RequestMapping("/workstationOutsideGeo")
public class WorkstationOutsideGeoController {
@Autowired
private WorkstationOutsideGeoService workstationOutsideGeoService;
@PostMapping("addGeo")
@ApiOperation("添加驻外区域 workstationId outsideGeoName province city county town village")
public ResponseVO addGeo(@RequestBody WorkstationOutsideGeoDO workstationOutsideGeoDO){
return ResponseData.generateCreatedResponse(0,workstationOutsideGeoService.addGeo(workstationOutsideGeoDO));
}
@PostMapping("updateGeo")
@ApiOperation("修改驻外区域 id workstationId outsideGeoName province city county town village")
public ResponseVO updateGeo(@RequestBody WorkstationOutsideGeoDO workstationOutsideGeoDO){
return ResponseData.generateCreatedResponse(0,workstationOutsideGeoService.updateGeo(workstationOutsideGeoDO));
}
@PostMapping("deleteGeo")
@ApiOperation("删除驻外区域 id ")
public ResponseVO deleteGeo(@RequestBody WorkstationOutsideGeoDO workstationOutside){
return ResponseData.generateCreatedResponse(0,workstationOutsideGeoService.deleteGeo(workstationOutside));
}
@PostMapping("queryGeos")
@ApiOperation("查询驻外区域（就业服务区域） workstationId province city county town village ")
public ResponseVO queryGeos(@RequestBody WorkstationOutsideGeoDO workstationOutsideGeoDO){
return ResponseData.generateCreatedResponse(0,workstationOutsideGeoService.queryGeos(workstationOutsideGeoDO));
}
}
src/main/java/com/laowu/dto/administer/AddAdministerRoleDTO.java 0 → 100644
package com.laowu.dto.administer;
import com.laowu.model.LibGeoLocationDO;
import lombok.Data;
import java.util.List;
@Data
public class AddAdministerRoleDTO {
private Long workstationId;
private Long roleId;
private Long administerId;
private String userName;
private String telephone;
private List<LibGeoLocationDO> geos;
}
src/main/java/com/laowu/dto/geo/LocalGeoMembersDTO.java 0 → 100644
package com.laowu.dto.geo;
import lombok.Data;
@Data
public class LocalGeoMembersDTO {
private Long workstationId;
private String county;
private String town;
private String village;
}
src/main/java/com/laowu/dto/geo/OutsideGeoMembersDTO.java 0 → 100644
package com.laowu.dto.geo;
import lombok.Data;
@Data
public class OutsideGeoMembersDTO {
private Long workstationId;
private String province;
private String city;
private String county;
private String town;
private String village;
}
src/main/java/com/laowu/dto/geo/WorkstationRoleGeosDTO.java 0 → 100644
package com.laowu.dto.geo;
import lombok.Data;
@Data
public class WorkstationRoleGeosDTO {
private Long workstationId;
private Long roleId;
private String province;
private String city;
private String county;
private String town;
private String village;
}
src/main/java/com/laowu/dto/label/AddNewsDTO.java 0 → 100644
package com.laowu.dto.label;
import com.laowu.model.NewsDictDO;
import lombok.Data;
import java.util.List;
@Data
public class AddNewsDTO extends NewsDictDO {
private List<Long> labelIds;
}
src/main/java/com/laowu/dto/label/NewsDTO.java 0 → 100644
package com.laowu.dto.label;
import lombok.Data;
@Data
public class NewsDTO {
private Integer pageSize;
private Integer pageNum;
private String title;
private Long labelId;
}
src/main/java/com/laowu/dto/member/AddressDTO.java 0 → 100644
package com.laowu.dto.member;
import lombok.Data;
import java.util.List;
@Data
public class AddressDTO {
private String label;
private String value;
private List<AddressDTO1> children;
}
src/main/java/com/laowu/dto/member/AddressDTO1.java 0 → 100644
package com.laowu.dto.member;
import lombok.Data;
import java.util.List;
@Data
public class AddressDTO1 {
private String label;
private String value;
private List<AddressDTO2> children;
}
src/main/java/com/laowu/dto/member/AddressDTO2.java 0 → 100644
package com.laowu.dto.member;
import lombok.Data;
import java.util.List;
@Data
public class AddressDTO2 {
private String label;
private String value;
private List<AddressDTO3> children;
}
src/main/java/com/laowu/dto/member/AddressDTO3.java 0 → 100644
package com.laowu.dto.member;
import lombok.Data;
import java.util.List;
@Data
public class AddressDTO3 {
private String label;
private String value;
private List<AddressDTO3> children;
}
src/main/java/com/laowu/dto/member/AllMembersDTO.java
......@@ -19,4 +19,6 @@ public class AllMembersDTO {
private String userName;
private Long positionId;
}
src/main/java/com/laowu/dto/member/DownloadErrorDataDTO.java 0 → 100644
package com.laowu.dto.member;
import com.laowu.vo.member.ImportMemberVO;
import lombok.Data;
import java.util.List;
@Data
public class DownloadErrorDataDTO {
private List<ImportMemberVO> importMemberVOS;
}
src/main/java/com/laowu/dto/member/ImportMemberDTO.java 0 → 100644
package com.laowu.dto.member;
import com.laowu.util.ExcelColumnUtil;
import lombok.Data;
@Data
public class ImportMemberDTO {
@ExcelColumnUtil(value = "姓名", col = 1)
private String userName;
@ExcelColumnUtil(value = "身份证号码", col = 2)
private String idCard;
@ExcelColumnUtil(value = "省", col = 3)
private String province;
@ExcelColumnUtil(value = "市", col = 4)
private String city;
@ExcelColumnUtil(value = "县", col = 5)
private String county;
// @ExcelColumnUtil(value = "镇", col = 6)
// private String town;
@ExcelColumnUtil(value = "具体地址", col = 6)
private String address;
@ExcelColumnUtil(value = "手机号", col = 7)
private String telephone;
@ExcelColumnUtil(value = "技能", col = 8)
private String major;
@ExcelColumnUtil(value = "最高学历", col = 9)
private String education;
@ExcelColumnUtil(value = "脱贫劳动力（是/否）", col = 10)
private String isPoor;
@ExcelColumnUtil(value = "易迁户（是/否）", col = 11)
private String isMigration;
@ExcelColumnUtil(value = "政治面貌（党员/群众）", col = 12)
private String isParty;
}
src/main/java/com/laowu/dto/member/RosterDTO.java 0 → 100644
package com.laowu.dto.member;
import lombok.Data;
@Data
public class RosterDTO {
private Integer pageSize;
private Integer pageNum;
}
src/main/java/com/laowu/dto/role/UpdatePermissionsDTO.java 0 → 100644
package com.laowu.dto.role;
import lombok.Data;
import java.util.List;
@Data
public class UpdatePermissionsDTO {
private Long roleId;
private List<Long> permissions;
}
src/main/java/com/laowu/dto/station/UpdateAdministerRoleDTO.java 0 → 100644
package com.laowu.dto.station;
import lombok.Data;
import java.util.List;
@Data
public class UpdateAdministerRoleDTO {
private Long administerId;
private Long roleId;
private Long workstationId;
private String userName;
private String telephone;
private List<Long> regionIds;
}
src/main/java/com/laowu/dto/team/MemberManagementDTO.java
......@@ -20,4 +20,6 @@ public class MemberManagementDTO {
private String userName;
private Long userId;
private Long positionId;
}
src/main/java/com/laowu/mapper/AdministerMapper.java
......@@ -21,5 +21,12 @@ public interface AdministerMapper extends BaseMapper<AdministerDO> {
List<PermissionsVO> getPermissions(Long id);
/**
* 查看所有权限
*/
List<PermissionsVO> getAllPermissions();
// List<PermissionsVO> rolePermissions(Long id);
IPage<AdministerDO> all(IPage page,String status);
}
src/main/java/com/laowu/mapper/AdministerStationRoleMapper.java 0 → 100644
package com.laowu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.laowu.model.AdministerStationRoleDO;
import com.laowu.vo.admin.AdministerStationsVO;
import com.laowu.vo.admin.WorkstationRolesAdministersVO;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 管理员-管理区域表 Mapper 接口
* </p>
*
* @author Tuyp
* @since 2023-06-19
*/
@Repository
public interface AdministerStationRoleMapper extends BaseMapper<AdministerStationRoleDO> {
//工作站下某角色的用户
List<WorkstationRolesAdministersVO> workstationRoleAdministers(Long workstationId, Long roleId, String province, String city, String county, String town, String village);
//查看某个角色下的管理区域
List<AdministerStationRoleDO> workstationAdministerGeos(Long workstationId, Long roleId, Long administerId);
//查看角色当下的管理区域是否存在
Integer geoCount(Long workstationId, Long roleId, Long administerId, String province, String city, String county, String town, String village);
//某个角色下的管理区域 返回工作站名称 县 镇 村
List<AdministerStationsVO> administerStations(Long administerId);
//查看某个用户已经存在的管理区域
List<Long> administerRegionIds(Long administerId);
}
src/main/java/com/laowu/mapper/LibGeoLocationMapper.java
......@@ -3,7 +3,10 @@ package com.laowu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.laowu.model.LibGeoLocationDO;
import com.laowu.vo.geo.CountyCountsVO;
import com.laowu.vo.geo.GeoVO;
import com.laowu.vo.geo.TownCountsVO;
import com.laowu.vo.geo.VillageCountsVO;
import org.springframework.stereotype.Repository;
import java.util.List;
......@@ -19,12 +22,55 @@ import java.util.List;
@Repository
public interface LibGeoLocationMapper extends BaseMapper<LibGeoLocationDO> {
/**
* 查所有的省
*/
List<String> provinces();
/**
* 通过省去查市
*/
List<String> cities(String province);
/**
* 通过省市去查县
*/
List<String> county(String province,String city);
/**
* 通过省市县去查镇
*/
List<String> towns(String province,String city,String county);
/**
* 通过省市县镇去查村
*/
List<String> villages(String province,String city,String county,String town);
/**
* 省 市 县 镇 个数（村）
*/
IPage<GeoVO> geo(IPage iPage, String province, String city, String county, String town);
/**
* 去重去查
*/
List<String> localVillages(LibGeoLocationDO libGeoLocationDO);
/**
* 县+人数
*/
CountyCountsVO countyCounts(Long workStationId);
/**
* 镇+人数
*/
List<TownCountsVO> townCounts(Long workStationId, String town);
/**
* 村+人数
*/
List<VillageCountsVO> villageCounts(Long workStationId,String town, String village);
}
src/main/java/com/laowu/mapper/MemberDictMapper.java
......@@ -23,7 +23,7 @@ public interface MemberDictMapper extends BaseMapper<MemberDictDO> {
/**
* 查询自然人
*/
IPage<AllMembersVO> allMembers(IPage pager, String province, String city, String county, String status, String userName);
IPage<AllMembersVO> allMembers(IPage pager, String province, String city, String county, String status, String userName,Long positionId);
/**
* 查看某个团队的人 返回id
......
src/main/java/com/laowu/mapper/NewsDictMapper.java 0 → 100644
package com.laowu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.laowu.model.NewsDictDO;
import com.laowu.model.NewsLabelDictDO;
import com.laowu.vo.lables.NewsVO;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@Repository
public interface NewsDictMapper extends BaseMapper<NewsDictDO> {
/**
* 查看新闻
*/
IPage<NewsVO> news(IPage iPage,Long labelId,String title);
/**
* 查看新闻有哪几个
*/
List<NewsLabelDictDO> newsLabels(Long newId);
/**
* 把所有置顶状态都置为0
*/
void updateTopStatus();
/**
* 查看一个新闻
*/
NewsVO oneNews(Long id);
/**
* 查看除去置顶的新闻
*/
IPage<NewsVO> noTopNews(IPage iPage,Long labelId,String title);
}
src/main/java/com/laowu/mapper/NewsLabelDictMapper.java 0 → 100644
package com.laowu.mapper;
import com.laowu.model.NewsLabelDictDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.laowu.vo.lables.LablesVO;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@Repository
public interface NewsLabelDictMapper extends BaseMapper<NewsLabelDictDO> {
List<LablesVO> lables(String label);
}
src/main/java/com/laowu/mapper/NewsLabelsMapper.java 0 → 100644
package com.laowu.mapper;
import com.laowu.model.NewsLabelsDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@Repository
public interface NewsLabelsMapper extends BaseMapper<NewsLabelsDO> {
/**
* 新闻有哪几个标签
*/
List<Long> labelIds(Long newsId);
}
src/main/java/com/laowu/mapper/RolePermissionMappingMapper.java
package com.laowu.mapper;
import com.laowu.model.PermissionsDictDO;
import com.laowu.model.RolePermissionMappingDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 系统用户角色表 Mapper 接口
......@@ -12,7 +15,18 @@ import org.springframework.stereotype.Repository;
* @author Tuyp
* @since 2023-02-20
*/
@Repository
@Repository
public interface RolePermissionMappingMapper extends BaseMapper<RolePermissionMappingDO> {
/**
* 查看某个角色所有的权限
*/
List<PermissionsDictDO> rolePermissions(Long roleId);
/**
* 查看某个角色所有的权限 返回id
*/
List<Long> rolePermissionIds(Long roleId);
}
src/main/java/com/laowu/mapper/TeamDictMapper.java
......@@ -36,13 +36,13 @@ public interface TeamDictMapper extends BaseMapper<TeamDictDO> {
/**
* 人员管理
*/
IPage<MemberManagementVO> memberManagement(IPage page, Long teamId, Long stationId, String province, String jobStatus, String userName, List<Long> workstationIds);
IPage<MemberManagementVO> memberManagement(IPage page, Long teamId, Long stationId, String province, String jobStatus, String userName, List<Long> workstationIds,Long positionId);
/**
* 人员管理---人数
*/
Integer memberManagementCount(Long teamId, Long stationId, String province, String jobStatus);
Integer memberManagementCount(Long teamId, Long stationId, String province, String jobStatus,Long positionId);
/**
* 将组长为memberId的team职位空
......
src/main/java/com/laowu/mapper/WorkstationOutsideGeoMapper.java 0 → 100644
package com.laowu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.laowu.model.WorkstationOutsideGeoDO;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 驻外区域字典表 Mapper 接口
* </p>
*
* @author Tuyp
* @since 2023-06-16
*/
@Repository
public interface WorkstationOutsideGeoMapper extends BaseMapper<WorkstationOutsideGeoDO> {
Integer geoCnt(Long id, Long workstationId, String province, String city, String county, String town, String village);
void updateGeo(Long id, String province, String city, String county, String town, String village);
List<WorkstationOutsideGeoDO> queryGeos(Long workstationId, String province, String city, String county, String town, String village);
}
src/main/java/com/laowu/model/AdministerStationRoleDO.java 0 → 100644
package com.laowu.model;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.laowu.util.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 管理员-管理区域表
* </p>
*
* @author Tuyp
* @since 2023-06-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("administer_station_role")
public class AdministerStationRoleDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 管理员id
*/
private Long administerId;
/**
* 工作站
*/
private Long workstationId;
/**
* 角色id
*/
private Long roleId;
private String province;
private String city;
private String county;
private String town;
private String village;
}
src/main/java/com/laowu/model/CompanyDictDO.java
......@@ -30,6 +30,9 @@ public class CompanyDictDO extends BaseModel {
*/
private String companyName;
private String companyProperty;
// /**
// * 企业logo
// */
......
src/main/java/com/laowu/model/MemberDictDO.java
......@@ -66,6 +66,16 @@ public class MemberDictDO extends BaseModel {
private String county;
/**
* 镇
*/
private String town;
/**
* 村
*/
private String village;
/**
* 具体地址
*/
private String address;
......
src/main/java/com/laowu/model/NewsDictDO.java 0 → 100644
package com.laowu.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.laowu.util.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("news_dict")
public class NewsDictDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 标题
*/
private String title;
/**
* 引导语
*/
private String guiding;
/**
* 状态
*/
private String status;
/**
* 发布时间
*/
private String publishDate;
/**
* 发布账户
*/
private Long publishId;
/**
* 详情
*/
private String content;
/**
* 封面
*/
private String coverPage;
/**
* 指定标识
*/
private Integer topFlag;
}
src/main/java/com/laowu/model/NewsLabelDictDO.java 0 → 100644
package com.laowu.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.laowu.util.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("news_label_dict")
public class NewsLabelDictDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 标签名称
*/
private String label;
/**
* 创建账户
*/
private Long createBy;
}
src/main/java/com/laowu/model/NewsLabelsDO.java 0 → 100644
package com.laowu.model;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.laowu.util.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("news_labels")
public class NewsLabelsDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private Long newsId;
private Long labelId;
}
src/main/java/com/laowu/model/PositionDictDO.java
......@@ -33,5 +33,7 @@ public class PositionDictDO extends BaseModel {
private String positionCode;
private String fullName;
private List<PositionDictDO> children;
}
src/main/java/com/laowu/model/RoleDictDO.java
......@@ -30,5 +30,10 @@ public class RoleDictDO extends BaseModel {
*/
private String role;
/**
* 角色类型
*/
private String roleType;
}
src/main/java/com/laowu/model/WorkstationOutsideGeoDO.java 0 → 100644
package com.laowu.model;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.laowu.util.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 驻外区域字典表
* </p>
*
* @author Tuyp
* @since 2023-06-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("workstation_outside_geo")
public class WorkstationOutsideGeoDO extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 工作站id
*/
private Long workstationId;
/**
* 驻外区域名称
*/
private String outsideGeoName;
/**
* 省
*/
private String province;
/**
* 市
*/
private String city;
/**
* 县
*/
private String county;
/**
* 镇
*/
private String town;
/**
* 村
*/
private String village;
}
src/main/java/com/laowu/service/AdministerStationRoleService.java 0 → 100644
package com.laowu.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.laowu.dto.administer.AddAdministerRoleDTO;
import com.laowu.dto.geo.WorkstationRoleGeosDTO;
import com.laowu.dto.station.UpdateAdministerRoleDTO;
import com.laowu.model.AdministerStationRoleDO;
import com.laowu.vo.admin.AdministerStationsVO;
import com.laowu.vo.admin.WorkstationRolesAdministersVO;
import java.util.List;
/**
* <p>
* 管理员-管理区域表 服务类
* </p>
*
* @author Tuyp
* @since 2023-06-19
*/
public interface AdministerStationRoleService extends IService<AdministerStationRoleDO> {
List<WorkstationRolesAdministersVO> workstationRoleGeos(WorkstationRoleGeosDTO workstationRoleGeosDTO);
String deleteAdministerRole(AdministerStationRoleDO administerStationRoleDO);
String addAdministerRole(AddAdministerRoleDTO addAdministerRoleDTO);
String deleteAdministerRoleGeo(AdministerStationRoleDO administerStationRoleDO);
List<AdministerStationsVO> administerStations(AdministerStationRoleDO administerStationRoleDO);
String updateAdministerRole(UpdateAdministerRoleDTO updateAdministerRoleDTO);
}
src/main/java/com/laowu/service/CompanyDictService.java
......@@ -8,6 +8,7 @@ import com.laowu.dto.company.DeleteCompanyDTO;
import com.laowu.dto.company.StationCompanyDTO;
import com.laowu.model.CompanyDictDO;
import com.laowu.model.WorkstationDictDO;
import com.laowu.vo.company.CompanyCardVO;
import com.laowu.vo.company.CompanyVO;
import com.laowu.vo.team.TotalTeamsVO;
......@@ -34,4 +35,6 @@ public interface CompanyDictService extends IService<CompanyDictDO> {
TotalTeamsVO totalCount(WorkstationDictDO workstationDictDO);
IPage stationCompany(StationCompanyDTO stationCompanyDTO);
CompanyCardVO companyCard(CompanyDictDO companyDictDO);
}
src/main/java/com/laowu/service/LibGeoLocationService.java
......@@ -3,7 +3,10 @@ package com.laowu.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.laowu.dto.geo.AllGeosDTO;
import com.laowu.dto.geo.LocalGeoMembersDTO;
import com.laowu.model.LibGeoLocationDO;
import com.laowu.vo.geo.CountyCountsVO;
import com.laowu.vo.geo.CountyVO;
import com.laowu.vo.geo.ProvincesVO;
import java.util.List;
......@@ -20,10 +23,16 @@ public interface LibGeoLocationService extends IService<LibGeoLocationDO> {
List<ProvincesVO> provinces();
List<String> province();
List<String> cities(LibGeoLocationDO libGeoLocationDO);
List<String> county(LibGeoLocationDO libGeoLocationDO);
List<String> town(LibGeoLocationDO libGeoLocationDO);
List<String> village(LibGeoLocationDO libGeoLocationDO);
List<LibGeoLocationDO> villages(LibGeoLocationDO libGeoLocationDO);
IPage geo(AllGeosDTO allGeosDTO);
......@@ -33,4 +42,9 @@ public interface LibGeoLocationService extends IService<LibGeoLocationDO> {
String updateGeo(LibGeoLocationDO libGeoLocationDO);
String deleteGeo(LibGeoLocationDO libGeoLocationDO);
List<CountyVO> localVillages(LibGeoLocationDO libGeoLocationDO);
CountyCountsVO localGeoMembers(LocalGeoMembersDTO localGeoMembersDTO);
}
src/main/java/com/laowu/service/MemberDictService.java
......@@ -2,12 +2,12 @@ package com.laowu.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.laowu.dto.member.AddMemberDTO;
import com.laowu.dto.member.AllMembersDTO;
import com.laowu.dto.member.UpdateMemberDTO;
import com.laowu.dto.member.*;
import com.laowu.model.MemberDictDO;
import com.laowu.vo.member.AllMembersVO;
import com.laowu.vo.member.OneMemberVO;
import com.laowu.vo.member.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
* <p>
......@@ -28,4 +28,15 @@ public interface MemberDictService extends IService<MemberDictDO> {
OneMemberVO oneMember(MemberDictDO memberDictDO);
String updateMember(UpdateMemberDTO updateMemberDTO);
MemberCardVO memberCard(MemberDictDO memberDictDO);
ImportMemberDictVO importMember(String workstationId,String teamId,MultipartFile multipartFile);
String downloadErrorData(DownloadErrorDataDTO downloadErrorDataDTO);
void address(List<AddressDTO> addressDTO);
IPage<RosterVO> roster(RosterDTO rosterDTO);
}
src/main/java/com/laowu/service/NewsDictService.java 0 → 100644
package com.laowu.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.laowu.dto.label.AddNewsDTO;
import com.laowu.dto.label.NewsDTO;
import com.laowu.model.NewsDictDO;
import com.laowu.vo.lables.NewsVO;
/**
* <p>
* 服务类
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
public interface NewsDictService extends IService<NewsDictDO> {
IPage<NewsVO> news(NewsDTO newsDTO);
String top(NewsDictDO newsDictDO);
String deleteNews(NewsDictDO newsDictDO);
String addNews(AddNewsDTO addNewsDTO);
String updateNews(AddNewsDTO updateNewsDTO);
NewsVO oneNews(NewsDictDO newsDictDO);
IPage<NewsVO> noTopNews(NewsDTO newsDTO);
}
src/main/java/com/laowu/service/NewsLabelDictService.java 0 → 100644
package com.laowu.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.laowu.model.NewsLabelDictDO;
import com.laowu.vo.lables.LablesVO;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
public interface NewsLabelDictService extends IService<NewsLabelDictDO> {
String addLabel(NewsLabelDictDO newsLabelDictDO);
String updateLabel(NewsLabelDictDO newsLabelDictDO);
String deleteLabel(NewsLabelDictDO newsLabelDictDO);
List<LablesVO> lables(NewsLabelDictDO newsLabelDictDO);
}
src/main/java/com/laowu/service/NewsLabelsService.java 0 → 100644
package com.laowu.service;
import com.laowu.model.NewsLabelsDO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
public interface NewsLabelsService extends IService<NewsLabelsDO> {
}
src/main/java/com/laowu/service/RoleDictService.java
package com.laowu.service;
import com.laowu.model.RoleDictDO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.laowu.dto.role.UpdatePermissionsDTO;
import com.laowu.model.RoleDictDO;
import com.laowu.vo.admin.PermissionsVO;
import com.laowu.vo.station.WorkstationRolesVO;
import java.util.List;
/**
* <p>
......@@ -13,4 +18,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface RoleDictService extends IService<RoleDictDO> {
List<WorkstationRolesVO> workstationRoles();
List<PermissionsVO> allPermissions();
String updatePermissions(UpdatePermissionsDTO updatePermissionsDTO);
}
src/main/java/com/laowu/service/WorkstationOutsideGeoService.java 0 → 100644
package com.laowu.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.laowu.model.WorkstationOutsideGeoDO;
import java.util.List;
/**
* <p>
* 驻外区域字典表 服务类
* </p>
*
* @author Tuyp
* @since 2023-06-16
*/
public interface WorkstationOutsideGeoService extends IService<WorkstationOutsideGeoDO> {
String addGeo(WorkstationOutsideGeoDO workstationOutsideGeoDO);
String updateGeo(WorkstationOutsideGeoDO workstationOutsideGeoDO);
String deleteGeo(WorkstationOutsideGeoDO workstationOutsideGeoDO);;
List<WorkstationOutsideGeoDO> queryGeos(WorkstationOutsideGeoDO workstationOutsideGeoDO);
}
src/main/java/com/laowu/service/impl/AdministerServiceImpl.java
......@@ -18,6 +18,7 @@ import com.laowu.service.AdministerService;
import com.laowu.util.ConstantUtils;
import com.laowu.util.JwtUtil;
import com.laowu.util.Localstorage;
import com.laowu.util.MyStringUtils;
import com.laowu.vo.admin.AdministerPermissionVO;
import com.laowu.vo.admin.LoginVO;
import com.laowu.vo.admin.PermissionsVO;
......@@ -94,13 +95,6 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
});
}
administerPermissionVO.setPermissions(treeList);
// //查询角色
// RoleAdministerMappingDO roleAdministerMappingDO = roleAdministerMappingMapper.selectOne(new QueryWrapper<RoleAdministerMappingDO>()
// .lambda()
// .eq(RoleAdministerMappingDO::getAdministerId, administerDO.getId()));
// if (null != roleAdministerMappingDO) {
// administerPermissionVO.setRole(roleAdministerMappingDO.getRoleId());
// }
//是不是管理员
int count = roleAdministerMappingMapper.selectCount(new QueryWrapper<RoleAdministerMappingDO>()
......@@ -140,6 +134,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
administerDO.setStatus("正常");
administerDO.setPassword("123456");
administerDO.setAccount(MyStringUtils.randomName(8));
this.baseMapper.insert(administerDO);
RoleAdministerMappingDO roleAdministerMappingDO = new RoleAdministerMappingDO();
......
src/main/java/com/laowu/service/impl/AdministerStationRoleServiceImpl.java 0 → 100644
package com.laowu.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.laowu.common.exception.HttpException;
import com.laowu.dto.administer.AddAdministerRoleDTO;
import com.laowu.dto.geo.WorkstationRoleGeosDTO;
import com.laowu.dto.station.UpdateAdministerRoleDTO;
import com.laowu.mapper.AdministerMapper;
import com.laowu.mapper.AdministerStationRoleMapper;
import com.laowu.model.AdministerDO;
import com.laowu.model.AdministerStationRoleDO;
import com.laowu.model.LibGeoLocationDO;
import com.laowu.service.AdministerStationRoleService;
import com.laowu.util.ConstantUtils;
import com.laowu.util.MyStringUtils;
import com.laowu.vo.admin.AdministerStationsVO;
import com.laowu.vo.admin.WorkstationRolesAdministersVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* <p>
* 管理员-管理区域表 服务实现类
* </p>
*
* @author Tuyp
* @since 2023-06-19
*/
@Service
public class AdministerStationRoleServiceImpl extends ServiceImpl<AdministerStationRoleMapper, AdministerStationRoleDO> implements AdministerStationRoleService {
@Autowired
private AdministerMapper administerMapper;
public List<WorkstationRolesAdministersVO> workstationRoleGeos(WorkstationRoleGeosDTO workstationRoleGeosDTO) {
//查找站管理员下面的角色
List<WorkstationRolesAdministersVO> workstationRolesAdministersVOS = this.baseMapper.workstationRoleAdministers(workstationRoleGeosDTO.getWorkstationId(),
workstationRoleGeosDTO.getRoleId(),
workstationRoleGeosDTO.getProvince(),
workstationRoleGeosDTO.getCity(),
workstationRoleGeosDTO.getCounty(),
workstationRoleGeosDTO.getTown(),
workstationRoleGeosDTO.getVillage());
for (WorkstationRolesAdministersVO wrav : workstationRolesAdministersVOS) {
//查看该管理员的管理区域 administerId
List<AdministerStationRoleDO> administerStationRoleDOS = this.baseMapper.workstationAdministerGeos(workstationRoleGeosDTO.getWorkstationId(), workstationRoleGeosDTO.getRoleId(), wrav.getAdministerId());
wrav.setAdministerStationRoleDOS(administerStationRoleDOS);
}
return workstationRolesAdministersVOS;
}
public String deleteAdministerRole(AdministerStationRoleDO administerStationRoleDO) {
this.baseMapper.delete(new QueryWrapper<AdministerStationRoleDO>()
.lambda()
.eq(AdministerStationRoleDO::getAdministerId, administerStationRoleDO.getAdministerId())
.eq(AdministerStationRoleDO::getRoleId, administerStationRoleDO.getRoleId())
.eq(AdministerStationRoleDO::getWorkstationId, administerStationRoleDO.getWorkstationId()));
return ConstantUtils.DELETE_SUCCESS;
}
@Transactional(rollbackFor = Exception.class)
public String addAdministerRole(AddAdministerRoleDTO addAdministerRoleDTO) {
//查看该手机号是否存在，存在的话用以前的id，没有的话新建一个administer
AdministerDO administerDO = administerMapper.selectOne(new QueryWrapper<AdministerDO>()
.lambda()
.eq(AdministerDO::getTelephone, addAdministerRoleDTO.getTelephone()));
Long administerId = null;
if (administerDO != null) {
administerId = administerDO.getId();
} else {
administerDO = new AdministerDO();
administerDO.setTelephone(addAdministerRoleDTO.getTelephone());
administerDO.setAccount(MyStringUtils.randomName(8));
administerDO.setPassword("123456");
administerDO.setUserName(addAdministerRoleDTO.getUserName());
administerMapper.insert(administerDO);
administerId = administerDO.getId();
}
List<LibGeoLocationDO> geos = addAdministerRoleDTO.getGeos();
for (LibGeoLocationDO geo : geos) {
//查看存不存在，存在的话就抛异常
Integer count = this.baseMapper.geoCount(addAdministerRoleDTO.getWorkstationId(),
addAdministerRoleDTO.getRoleId(),
administerId,
geo.getProvince(),
geo.getCity(),
geo.getCounty(),
geo.getTown(),
geo.getVillage());
if (count > 0) {
throw new HttpException(70001);
}
AdministerStationRoleDO administerStationRoleDO = new AdministerStationRoleDO();
administerStationRoleDO.setAdministerId(administerId);
administerStationRoleDO.setRoleId(addAdministerRoleDTO.getRoleId());
administerStationRoleDO.setWorkstationId(addAdministerRoleDTO.getWorkstationId());
administerStationRoleDO.setProvince(geo.getProvince());
administerStationRoleDO.setCity(geo.getCity());
administerStationRoleDO.setCounty(geo.getCounty());
administerStationRoleDO.setTown(geo.getTown());
administerStationRoleDO.setVillage(geo.getVillage());
this.baseMapper.insert(administerStationRoleDO);
}
return ConstantUtils.ADD_SUCCESS;
}
public String deleteAdministerRoleGeo(AdministerStationRoleDO administerStationRoleDO) {
this.baseMapper.deleteById(administerStationRoleDO.getId());
return ConstantUtils.ADD_SUCCESS;
}
public List<AdministerStationsVO> administerStations(AdministerStationRoleDO administerStationRoleDO) {
return this.baseMapper.administerStations(administerStationRoleDO.getAdministerId());
}
@Transactional(rollbackFor = Exception.class)
public String updateAdministerRole(UpdateAdministerRoleDTO updateAdministerRoleDTO) {
//修改账户信息
AdministerDO administerDO = administerMapper.selectById(updateAdministerRoleDTO.getAdministerId());
if (StringUtils.isNotEmpty(updateAdministerRoleDTO.getUserName())){
administerDO.setUserName(updateAdministerRoleDTO.getUserName());
}
if (StringUtils.isNotEmpty(updateAdministerRoleDTO.getTelephone())){
administerDO.setTelephone(updateAdministerRoleDTO.getTelephone());
}
administerMapper.updateById(administerDO);
//修改管理区域
if (updateAdministerRoleDTO.getRegionIds().size()>0){
//TODO
//查看已有的
List<Long> oldIds = this.baseMapper.administerRegionIds(updateAdministerRoleDTO.getAdministerId());
List<Long> newIds = updateAdministerRoleDTO.getRegionIds();
}
return ConstantUtils.SUCCESS_UPDATE;
}
}
src/main/java/com/laowu/service/impl/CompanyDictServiceImpl.java
......@@ -13,6 +13,7 @@ import com.laowu.mapper.*;
import com.laowu.model.*;
import com.laowu.service.CompanyDictService;
import com.laowu.util.ConstantUtils;
import com.laowu.vo.company.CompanyCardVO;
import com.laowu.vo.company.CompanyUpdateHistoryVO;
import com.laowu.vo.company.CompanyVO;
import com.laowu.vo.company.RelateWorkVO;
......@@ -251,7 +252,7 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
if (null != companyDictDO1.getBusinessId()) {
BusinessDictDO businessDictDO = businessDictMapper.selectById(companyDictDO1.getBusinessId());
if (null != businessDictDO){
if (null != businessDictDO) {
companyVO.setBusiness(businessDictDO.getBusiness());
}
}
......@@ -316,4 +317,25 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
}
return company;
}
public CompanyCardVO companyCard(CompanyDictDO companyDictDO) {
CompanyCardVO companyCardVO = new CompanyCardVO();
CompanyDictDO companyDictDO1 = this.baseMapper.selectById(companyDictDO.getId());
BeanUtils.copyProperties(companyDictDO1,companyCardVO);
//写死值
companyCardVO.setValidateDuration("2023/03/14-2024/03/12");
companyCardVO.setRegisteredCapital("200w");
companyCardVO.setBus("09:00~17:00");
companyCardVO.setSocialSecurity("******");
companyCardVO.setFlowRate("20%");
companyCardVO.setCompanyScale("1000人");
companyCardVO.setCreditScore("650");
BusinessDictDO businessDictDO = businessDictMapper.selectById(companyDictDO1.getBusinessId());
companyCardVO.setBusiness(businessDictDO.getBusiness());
return companyCardVO;
}
}
src/main/java/com/laowu/service/impl/LibGeoLocationServiceImpl.java
......@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.laowu.common.exception.HttpException;
import com.laowu.dto.geo.AllGeosDTO;
import com.laowu.dto.geo.LocalGeoMembersDTO;
import com.laowu.mapper.LibGeoLocationMapper;
import com.laowu.model.LibGeoLocationDO;
import com.laowu.service.LibGeoLocationService;
import com.laowu.util.ConstantUtils;
import com.laowu.vo.geo.CityVO;
import com.laowu.vo.geo.ProvincesVO;
import com.laowu.vo.geo.*;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
......@@ -58,6 +58,11 @@ public class LibGeoLocationServiceImpl extends ServiceImpl<LibGeoLocationMapper,
return provincesVOS;
}
public List<String> province() {
return this.baseMapper.provinces();
}
public List<String> cities(LibGeoLocationDO libGeoLocationDO) {
return this.baseMapper.cities(libGeoLocationDO.getProvince());
}
......@@ -66,8 +71,15 @@ public class LibGeoLocationServiceImpl extends ServiceImpl<LibGeoLocationMapper,
return this.baseMapper.county(libGeoLocationDO.getProvince(), libGeoLocationDO.getCity());
}
public List<LibGeoLocationDO> villages(LibGeoLocationDO libGeoLocationDO) {
public List<String> town(LibGeoLocationDO libGeoLocationDO) {
return this.baseMapper.towns(libGeoLocationDO.getProvince(), libGeoLocationDO.getCity(), libGeoLocationDO.getCounty());
}
public List<String> village(LibGeoLocationDO libGeoLocationDO) {
return this.baseMapper.villages(libGeoLocationDO.getProvince(), libGeoLocationDO.getCity(), libGeoLocationDO.getCounty(), libGeoLocationDO.getTown());
}
public List<LibGeoLocationDO> villages(LibGeoLocationDO libGeoLocationDO) {
return this.baseMapper.selectList(new QueryWrapper<LibGeoLocationDO>()
.lambda()
.eq(LibGeoLocationDO::getProvince, libGeoLocationDO.getProvince())
......@@ -122,4 +134,46 @@ public class LibGeoLocationServiceImpl extends ServiceImpl<LibGeoLocationMapper,
return ConstantUtils.DELETE_SUCCESS;
}
public List<CountyVO> localVillages(LibGeoLocationDO libGeoLocationDO) {
List<CountyVO> countyVOS = new ArrayList<>();
List<String> counties = this.baseMapper.localVillages(libGeoLocationDO);
for (String county : counties) {
CountyVO countyVO = new CountyVO();
countyVO.setCounty(county);
//通过省市县 查镇
List<String> towns = this.baseMapper.towns(libGeoLocationDO.getProvince(), libGeoLocationDO.getCity(), county);
List<TownVO> townVOS = new ArrayList<>();
for (String town : towns) {
TownVO townVO = new TownVO();
townVO.setTown(town);
//省市县镇查村
List<String> villages = this.baseMapper.villages(libGeoLocationDO.getProvince(), libGeoLocationDO.getCity(), county, town);
townVO.setVillage(villages);
townVOS.add(townVO);
}
countyVO.setTowns(townVOS);
countyVOS.add(countyVO);
}
return countyVOS;
}
public CountyCountsVO localGeoMembers(LocalGeoMembersDTO localGeoMembersDTO) {
//查县-人数
CountyCountsVO countyCountsVOS = this.baseMapper.countyCounts(localGeoMembersDTO.getWorkstationId());
//查镇-人数
List<TownCountsVO> townCountsVOS = this.baseMapper.townCounts(localGeoMembersDTO.getWorkstationId(), localGeoMembersDTO.getTown());
for (TownCountsVO townCountsVO : townCountsVOS) {
//查村-人数
List<VillageCountsVO> villageCountsVOS = this.baseMapper.villageCounts(localGeoMembersDTO.getWorkstationId(), townCountsVO.getName(), localGeoMembersDTO.getVillage());
townCountsVO.setChildren(villageCountsVOS);
}
countyCountsVOS.setChildren(townCountsVOS);
return countyCountsVOS;
}
}
src/main/java/com/laowu/service/impl/NewsDictServiceImpl.java 0 → 100644
package com.laowu.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.service.impl.ServiceImpl;
import com.laowu.dto.label.AddNewsDTO;
import com.laowu.dto.label.NewsDTO;
import com.laowu.mapper.NewsDictMapper;
import com.laowu.mapper.NewsLabelsMapper;
import com.laowu.model.NewsDictDO;
import com.laowu.model.NewsLabelDictDO;
import com.laowu.model.NewsLabelsDO;
import com.laowu.service.NewsDictService;
import com.laowu.util.ConstantUtils;
import com.laowu.vo.lables.NewsVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
* 服务实现类
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@Service
public class NewsDictServiceImpl extends ServiceImpl<NewsDictMapper, NewsDictDO> implements NewsDictService {
@Autowired
private NewsLabelsMapper newsLabelsMapper;
public IPage<NewsVO> news(NewsDTO newsDTO) {
Page pager = new Page(newsDTO.getPageNum(), newsDTO.getPageSize());
IPage<NewsVO> page = this.baseMapper.news(pager, newsDTO.getLabelId(), newsDTO.getTitle());
List<NewsVO> newsVOS = page.getRecords();
for (NewsVO newsVO : newsVOS) {
//标签
List<NewsLabelDictDO> newsLabelsDOS = this.baseMapper.newsLabels(newsVO.getId());
newsVO.setNewsLabelDictDOS(newsLabelsDOS);
}
return page;
}
@Transactional(rollbackFor = Exception.class)
public String top(NewsDictDO newsDictDO) {
this.baseMapper.updateTopStatus();
NewsDictDO newsDictDO1 = this.baseMapper.selectById(newsDictDO.getId());
newsDictDO1.setTopFlag(1);
this.baseMapper.updateById(newsDictDO1);
return ConstantUtils.SUCCESS_UPDATE;
}
@Transactional(rollbackFor = Exception.class)
public String deleteNews(NewsDictDO newsDictDO) {
this.baseMapper.deleteById(newsDictDO.getId());
newsLabelsMapper.delete(new QueryWrapper<NewsLabelsDO>()
.lambda()
.eq(NewsLabelsDO::getNewsId, newsDictDO.getId()));
return ConstantUtils.DELETE_SUCCESS;
}
@Transactional(rollbackFor = Exception.class)
public String addNews(AddNewsDTO addNewsDTO) {
NewsDictDO newsDictDO = new NewsDictDO();
BeanUtils.copyProperties(addNewsDTO, newsDictDO);
newsDictDO.setStatus("已隐藏");
newsDictDO.setTopFlag(0);
this.baseMapper.insert(newsDictDO);
List<Long> labelIds = addNewsDTO.getLabelIds();
if (labelIds.size() > 0) {
for (Long labelId : labelIds) {
NewsLabelsDO newsLabelsDO = new NewsLabelsDO();
newsLabelsDO.setLabelId(labelId);
newsLabelsDO.setNewsId(newsDictDO.getId());
newsLabelsMapper.insert(newsLabelsDO);
}
}
return ConstantUtils.ADD_SUCCESS;
}
public String updateNews(AddNewsDTO updateNewsDTO) {
NewsDictDO newsDictDO = new NewsDictDO();
BeanUtils.copyProperties(updateNewsDTO, newsDictDO);
this.baseMapper.updateById(newsDictDO);
if (null != updateNewsDTO.getLabelIds()) {
//找到已经有的work
List<Long> oldIds = newsLabelsMapper.labelIds(updateNewsDTO.getId());
List<Long> newIds = updateNewsDTO.getLabelIds();
List<Long> newIds2 = new ArrayList<Long>();
for (Long id : newIds) {
newIds2.add(id);
}
newIds.removeAll(oldIds); //新增的人在newIds里面
if (newIds.size() > 0) {
for (Long id : newIds) {
NewsLabelsDO newsLabelsDO = new NewsLabelsDO();
newsLabelsDO.setNewsId(updateNewsDTO.getId());
newsLabelsDO.setLabelId(id);
newsLabelsMapper.insert(newsLabelsDO);
}
}
oldIds.removeAll(newIds2);//删掉以前的
if (oldIds.size() > 0) {
for (Long id : oldIds) {
newsLabelsMapper.delete(new QueryWrapper<NewsLabelsDO>()
.lambda()
.eq(NewsLabelsDO::getNewsId, updateNewsDTO.getId())
.eq(NewsLabelsDO::getLabelId, id));
}
}
}
return ConstantUtils.SUCCESS_UPDATE;
}
public NewsVO oneNews(NewsDictDO newsDictDO) {
NewsVO newsVO = this.baseMapper.oneNews(newsDictDO.getId());
//标签
List<NewsLabelDictDO> newsLabelsDOS = this.baseMapper.newsLabels(newsVO.getId());
newsVO.setNewsLabelDictDOS(newsLabelsDOS);
return newsVO;
}
public IPage<NewsVO> noTopNews(NewsDTO newsDTO) {
Page pager = new Page(newsDTO.getPageNum(), newsDTO.getPageSize());
IPage<NewsVO> page = this.baseMapper.noTopNews(pager, newsDTO.getLabelId(), newsDTO.getTitle());
List<NewsVO> newsVOS = page.getRecords();
for (NewsVO newsVO : newsVOS) {
//标签
List<NewsLabelDictDO> newsLabelsDOS = this.baseMapper.newsLabels(newsVO.getId());
newsVO.setNewsLabelDictDOS(newsLabelsDOS);
}
return page;
}
}
src/main/java/com/laowu/service/impl/NewsLabelDictServiceImpl.java 0 → 100644
package com.laowu.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.laowu.common.exception.HttpException;
import com.laowu.mapper.NewsLabelDictMapper;
import com.laowu.mapper.NewsLabelsMapper;
import com.laowu.model.NewsLabelDictDO;
import com.laowu.model.NewsLabelsDO;
import com.laowu.service.NewsLabelDictService;
import com.laowu.util.ConstantUtils;
import com.laowu.vo.lables.LablesVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* <p>
* 服务实现类
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@Service
public class NewsLabelDictServiceImpl extends ServiceImpl<NewsLabelDictMapper, NewsLabelDictDO> implements NewsLabelDictService {
@Autowired
private NewsLabelsMapper newsLabelsMapper;
@Transactional(rollbackFor = Exception.class)
public String addLabel(NewsLabelDictDO newsLabelDictDO){
int count = this.baseMapper.selectCount(new QueryWrapper<NewsLabelDictDO>()
.lambda()
.eq(NewsLabelDictDO::getLabel,newsLabelDictDO.getLabel()));
if (count > 0){
throw new HttpException(70001);
}
this.baseMapper.insert(newsLabelDictDO);
return ConstantUtils.ADD_SUCCESS;
}
@Transactional(rollbackFor = Exception.class)
public String updateLabel(NewsLabelDictDO newsLabelDictDO){
int count = this.baseMapper.selectCount(new QueryWrapper<NewsLabelDictDO>()
.lambda()
.eq(NewsLabelDictDO::getLabel,newsLabelDictDO.getLabel())
.ne(NewsLabelDictDO::getId,newsLabelDictDO.getId()));
if (count > 0){
throw new HttpException(70001);
}
this.baseMapper.updateById(newsLabelDictDO);
return ConstantUtils.SUCCESS_UPDATE;
}
@Transactional(rollbackFor = Exception.class)
public String deleteLabel(NewsLabelDictDO newsLabelDictDO){
this.baseMapper.deleteById(newsLabelDictDO.getId());
newsLabelsMapper.delete(new QueryWrapper<NewsLabelsDO>()
.lambda()
.eq(NewsLabelsDO::getLabelId,newsLabelDictDO.getId()));
return ConstantUtils.DELETE_SUCCESS;
}
public List<LablesVO> lables(NewsLabelDictDO newsLabelDictDO){
return this.baseMapper.lables(newsLabelDictDO.getLabel());
}
}
src/main/java/com/laowu/service/impl/NewsLabelsServiceImpl.java 0 → 100644
package com.laowu.service.impl;
import com.laowu.model.NewsLabelsDO;
import com.laowu.mapper.NewsLabelsMapper;
import com.laowu.service.NewsLabelsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author Tuyp
* @since 2023-05-16
*/
@Service
public class NewsLabelsServiceImpl extends ServiceImpl<NewsLabelsMapper, NewsLabelsDO> implements NewsLabelsService {
}
src/main/java/com/laowu/service/impl/RoleDictServiceImpl.java
package com.laowu.service.impl;
import com.laowu.model.RoleDictDO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.laowu.dto.role.UpdatePermissionsDTO;
import com.laowu.mapper.AdministerMapper;
import com.laowu.mapper.RoleAdministerMappingMapper;
import com.laowu.mapper.RoleDictMapper;
import com.laowu.mapper.RolePermissionMappingMapper;
import com.laowu.model.PermissionsDictDO;
import com.laowu.model.RoleAdministerMappingDO;
import com.laowu.model.RoleDictDO;
import com.laowu.model.RolePermissionMappingDO;
import com.laowu.service.RoleDictService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.laowu.util.ConstantUtils;
import com.laowu.vo.admin.PermissionsVO;
import com.laowu.vo.station.WorkstationRolesVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
* 角色表 服务实现类
......@@ -17,4 +32,101 @@ import org.springframework.stereotype.Service;
@Service
public class RoleDictServiceImpl extends ServiceImpl<RoleDictMapper, RoleDictDO> implements RoleDictService {
@Autowired
private RoleAdministerMappingMapper roleAdministerMappingMapper;
@Autowired
private RolePermissionMappingMapper rolePermissionMappingMapper;
@Autowired
private AdministerMapper administerMapper;
public List<WorkstationRolesVO> workstationRoles() {
List<WorkstationRolesVO> workstationRolesVOS = new ArrayList<>();
//查看工作站账号
List<RoleDictDO> roleDictDOS = this.baseMapper.selectList(new QueryWrapper<RoleDictDO>()
.lambda()
.eq(RoleDictDO::getRoleType, 1));
for (RoleDictDO roleDictDO : roleDictDOS) {
WorkstationRolesVO workstationRolesVO = new WorkstationRolesVO();
workstationRolesVO.setRoleId(roleDictDO.getId());
//角色名称
workstationRolesVO.setRole(roleDictDO.getRole());
//角色人数
int count = roleAdministerMappingMapper.selectCount(new QueryWrapper<RoleAdministerMappingDO>()
.lambda()
.eq(RoleAdministerMappingDO::getRoleId, roleDictDO.getId()));
workstationRolesVO.setRoleCnt(count);
//权限范围
List<PermissionsDictDO> permissionsDictDOS = rolePermissionMappingMapper.rolePermissions(roleDictDO.getId());
workstationRolesVO.setPermissionsDictDOS(permissionsDictDOS);
workstationRolesVOS.add(workstationRolesVO);
}
return workstationRolesVOS;
}
public List<PermissionsVO> allPermissions() {
List<PermissionsVO> list = administerMapper.getAllPermissions();
List<PermissionsVO> treeList = new ArrayList();
if (list != null) {
list.forEach(permission -> {
if (permission.getParentId() == null) {
treeList.add(permission);
}
list.forEach(p -> {
if (null != p.getParentId() && p.getParentId().equals(permission.getId())) {
if (permission.getChildren() == null) {
permission.setChildren(new ArrayList<>());
}
permission.getChildren().add(p);
}
});
});
}
return treeList;
}
public String updatePermissions(UpdatePermissionsDTO updatePermissionsDTO){
//查看现有的权限
List<Long> permissionIds = rolePermissionMappingMapper.rolePermissionIds(updatePermissionsDTO.getRoleId());
List<Long> newIds = updatePermissionsDTO.getPermissions();
List<Long> newIds2 = new ArrayList<Long>();
for (Long id : newIds) {
newIds2.add(id);
}
newIds.removeAll(permissionIds); //新增的人在newIds里面
if (newIds.size() > 0) {
for (Long id : newIds) {
RolePermissionMappingDO rolePermissionMappingDO = new RolePermissionMappingDO();
rolePermissionMappingDO.setRoleId(updatePermissionsDTO.getRoleId());
rolePermissionMappingDO.setPermissionId(id);
rolePermissionMappingMapper.insert(rolePermissionMappingDO);
}
}
permissionIds.removeAll(newIds2);//删掉以前的
if (permissionIds.size() > 0) {
for (Long id : permissionIds) {
rolePermissionMappingMapper.delete(new QueryWrapper<RolePermissionMappingDO>()
.lambda()
.eq(RolePermissionMappingDO::getRoleId, updatePermissionsDTO.getRoleId())
.eq(RolePermissionMappingDO::getPermissionId, id));
}
}
return ConstantUtils.SUCCESS_UPDATE;
}
}
src/main/java/com/laowu/service/impl/TeamDictServiceImpl.java
......@@ -297,7 +297,7 @@ public class TeamDictServiceImpl extends ServiceImpl<TeamDictMapper, TeamDictDO>
//查看某个人所在的工作站
List<Long> workstationIds = workstationAdministersMapper.administerStations(memberManagementDTO.getUserId());
IPage<MemberManagementVO> memberManagementVOIPage = this.baseMapper.memberManagement(pager, memberManagementDTO.getTeamId(), memberManagementDTO.getStationId(), memberManagementDTO.getProvince(), memberManagementDTO.getJobStatus(), memberManagementDTO.getUserName(),workstationIds);
IPage<MemberManagementVO> memberManagementVOIPage = this.baseMapper.memberManagement(pager, memberManagementDTO.getTeamId(), memberManagementDTO.getStationId(), memberManagementDTO.getProvince(), memberManagementDTO.getJobStatus(), memberManagementDTO.getUserName(),workstationIds,memberManagementDTO.getPositionId());
List<MemberManagementVO> memberManagementVOS = memberManagementVOIPage.getRecords();
......@@ -327,7 +327,7 @@ public class TeamDictServiceImpl extends ServiceImpl<TeamDictMapper, TeamDictDO>
public TotalTeamsVO memberManagementCount(MemberManagementDTO memberManagementDTO) {
TotalTeamsVO totalTeamsVO = new TotalTeamsVO();
totalTeamsVO.setCount(this.baseMapper.memberManagementCount(memberManagementDTO.getTeamId(), memberManagementDTO.getStationId(), memberManagementDTO.getProvince(), memberManagementDTO.getJobStatus()));
totalTeamsVO.setCount(this.baseMapper.memberManagementCount(memberManagementDTO.getTeamId(), memberManagementDTO.getStationId(), memberManagementDTO.getProvince(), memberManagementDTO.getJobStatus(),memberManagementDTO.getPositionId()));
return totalTeamsVO;
}
......
src/main/java/com/laowu/service/impl/WorkstationOutsideGeoServiceImpl.java 0 → 100644
package com.laowu.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.laowu.common.exception.HttpException;
import com.laowu.mapper.WorkstationOutsideGeoMapper;
import com.laowu.model.WorkstationOutsideGeoDO;
import com.laowu.service.WorkstationOutsideGeoService;
import com.laowu.util.ConstantUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* <p>
* 驻外区域字典表 服务实现类
* </p>
*
* @author Tuyp
* @since 2023-06-16
*/
@Service
public class WorkstationOutsideGeoServiceImpl extends ServiceImpl<WorkstationOutsideGeoMapper, WorkstationOutsideGeoDO> implements WorkstationOutsideGeoService {
@Transactional(rollbackFor = Exception.class)
public String addGeo(WorkstationOutsideGeoDO workstationOutsideGeoDO) {
Integer count = this.baseMapper.geoCnt(workstationOutsideGeoDO.getId(), workstationOutsideGeoDO.getWorkstationId(), workstationOutsideGeoDO.getProvince(), workstationOutsideGeoDO.getCity(), workstationOutsideGeoDO.getCounty(), workstationOutsideGeoDO.getTown(), workstationOutsideGeoDO.getVillage());
if (count > 0) {
throw new HttpException(70001);
}
this.baseMapper.insert(workstationOutsideGeoDO);
return ConstantUtils.ADD_SUCCESS;
}
@Transactional(rollbackFor = Exception.class)
public String updateGeo(WorkstationOutsideGeoDO workstationOutsideGeoDO) {
Integer count = this.baseMapper.geoCnt(workstationOutsideGeoDO.getId(), workstationOutsideGeoDO.getWorkstationId(), workstationOutsideGeoDO.getProvince(), workstationOutsideGeoDO.getCity(), workstationOutsideGeoDO.getCounty(), workstationOutsideGeoDO.getTown(), workstationOutsideGeoDO.getVillage());
if (count > 0) {
throw new HttpException(70001);
}
this.baseMapper.updateGeo(workstationOutsideGeoDO.getId(),workstationOutsideGeoDO.getProvince(),workstationOutsideGeoDO.getCity(),workstationOutsideGeoDO.getCounty(),workstationOutsideGeoDO.getTown(),workstationOutsideGeoDO.getVillage());
return ConstantUtils.SUCCESS_UPDATE;
}
@Transactional(rollbackFor = Exception.class)
public String deleteGeo(WorkstationOutsideGeoDO workstationOutsideGeoDO) {
this.baseMapper.deleteById(workstationOutsideGeoDO.getId());
return ConstantUtils.DELETE_SUCCESS;
}
public List<WorkstationOutsideGeoDO> queryGeos(WorkstationOutsideGeoDO workstationOutsideGeoDO){
return this.baseMapper.queryGeos(workstationOutsideGeoDO.getWorkstationId(),workstationOutsideGeoDO.getProvince(),workstationOutsideGeoDO.getCity(), workstationOutsideGeoDO.getCounty(),workstationOutsideGeoDO.getTown(),workstationOutsideGeoDO.getVillage());
}
}
src/main/java/com/laowu/service/impl/WorkstationRequireMappingServiceImpl.java
......@@ -115,6 +115,16 @@ public class WorkstationRequireMappingServiceImpl extends ServiceImpl<Workstatio
BeanUtils.copyProperties(positionItemInfoDO, positionItemInfoDO1);
positionItemInfoDO1.setPositionRequireId(positionRequireItemDO1.getId());
positionItemInfoMapper.insert(positionItemInfoDO1);
List<PositionRequirePositionsDO> positionRequirePositionsDOS = positionRequirePositionsMapper.selectList(new QueryWrapper<PositionRequirePositionsDO>()
.lambda()
.eq(PositionRequirePositionsDO::getItemInfoId,positionItemInfoDO.getId()));
positionRequirePositionsDOS.stream().forEach(x->{
PositionRequirePositionsDO positionRequirePositionsDO = new PositionRequirePositionsDO();
positionRequirePositionsDO.setItemInfoId(positionItemInfoDO1.getId());
positionRequirePositionsDO.setPositionId(x.getPositionId());
positionRequirePositionsMapper.insert(positionRequirePositionsDO);
});
}
WorkstationRequireMappingDO workstationRequireMappingDO = new WorkstationRequireMappingDO();
......
src/main/java/com/laowu/util/ConstantUtils.java
......@@ -24,7 +24,7 @@ public class ConstantUtils {
public static final String SUCCESS_VERIFY = "验证成功";
public static final String FAIL_VERIFY = "验证失败";
public static final String SUCCESS_DOWNLOAD = "下载成功";
public static final String SUCCESS_LOGIN = "登录成功";
......
src/main/java/com/laowu/util/MyStringUtils.java 0 → 100644
package com.laowu.util;
import java.util.Random;
public class MyStringUtils {
public static String randomName(int length) {
String str="abcdefghijklmnopqrstuvwxyz0123456789";
Random random=new Random();
StringBuffer sb=new StringBuffer();
for(int i=0;i<length;i++){
int number=random.nextInt(36);
sb.append(str.charAt(number));
}
return sb.toString();
}
public static void main(String[] args) {
for (int i=0;i<50;i++){
System.out.println(randomName(8));
}
}
}
src/main/java/com/laowu/vo/admin/AdministerStationsVO.java 0 → 100644
package com.laowu.vo.admin;
import lombok.Data;
@Data
public class AdministerStationsVO {
private Long id;
private String workstationName;
private String county;
private String town;
private String village;
}
src/main/java/com/laowu/vo/admin/WorkstationAdministerGeosVO.java 0 → 100644
package com.laowu.vo.admin;
import lombok.Data;
@Data
public class WorkstationAdministerGeosVO {
}
src/main/java/com/laowu/vo/admin/WorkstationRolesAdministersVO.java 0 → 100644
package com.laowu.vo.admin;
import com.laowu.model.AdministerStationRoleDO;
import lombok.Data;
import java.util.List;
@Data
public class WorkstationRolesAdministersVO {
private Long id;
private Long administerId;
private Long roleId;
private Long workstationId;
private String userName;
private String account;
private String telephone;
private List<AdministerStationRoleDO> administerStationRoleDOS;
}
src/main/java/com/laowu/vo/company/CompanyCardVO.java 0 → 100644
package com.laowu.vo.company;
import com.laowu.model.CompanyDictDO;
import lombok.Data;
@Data
public class CompanyCardVO extends CompanyDictDO {
private String validateDuration;
private String registeredCapital;
private String environment;
private String bus;
private String socialSecurity;
private String flowRate;
private String companyScale;
private String creditScore;
private String business;
}
src/main/java/com/laowu/vo/company/CompanyVO.java
......@@ -25,6 +25,8 @@ public class CompanyVO {
private String companyCode;
private String companyProperty;
private String companyDesc;
private String companyOrigin;
......
src/main/java/com/laowu/vo/geo/CountyCountsVO.java 0 → 100644
package com.laowu.vo.geo;
import lombok.Data;
import java.util.List;
@Data
public class CountyCountsVO {
private String name;
private Integer cnt;
private List<TownCountsVO> children;
}
src/main/java/com/laowu/vo/geo/CountyVO.java 0 → 100644
package com.laowu.vo.geo;
import lombok.Data;
import java.util.List;
@Data
public class CountyVO {
private String county;
private List<TownVO> towns;
}
src/main/java/com/laowu/vo/geo/ProvinceCounts.java 0 → 100644
package com.laowu.vo.geo;
import lombok.Data;
@Data
public class ProvinceCounts {
}
src/main/java/com/laowu/vo/geo/TownCountsVO.java 0 → 100644
package com.laowu.vo.geo;
import lombok.Data;
import java.util.List;
@Data
public class TownCountsVO {
private String name;
private Integer cnt;
private List<VillageCountsVO> children;
}
src/main/java/com/laowu/vo/geo/TownVO.java 0 → 100644
package com.laowu.vo.geo;
import lombok.Data;
import java.util.List;
@Data
public class TownVO {
private String town;
private List<String> village;
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!