diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java new file mode 100644 index 0000000..f29d19b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUser; + +public interface AppUserMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java new file mode 100644 index 0000000..f29d19b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUser; + +public interface AppUserMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java new file mode 100644 index 0000000..b3e0014 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.WellPreAdd; + +public interface WellPreAddMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java new file mode 100644 index 0000000..f29d19b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUser; + +public interface AppUserMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java new file mode 100644 index 0000000..b3e0014 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.WellPreAdd; + +public interface WellPreAddMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java new file mode 100644 index 0000000..1541c19 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -0,0 +1,22 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * @author cz + */ +@Data +@TableName("app_product_safe") +public class AppProductSafe { + + private Long id; + private Long projectId; + private String signImage; + private String signName; + private Date signTime; + private Date creatime; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java new file mode 100644 index 0000000..f29d19b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUser; + +public interface AppUserMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java new file mode 100644 index 0000000..b3e0014 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.WellPreAdd; + +public interface WellPreAddMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java new file mode 100644 index 0000000..1541c19 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -0,0 +1,22 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * @author cz + */ +@Data +@TableName("app_product_safe") +public class AppProductSafe { + + private Long id; + private Long projectId; + private String signImage; + private String signName; + private Date signTime; + private Date creatime; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java new file mode 100644 index 0000000..0d83ff7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +@TableName("app_user") +@Data +public class AppUser { + private Long id; + private String acount; + private String password; + private String name; + private String phone; + private String projectId; + private String attr; + @TableField("attr_alias") + private String attrAlias; + private String role; + private String openId; + private Date labelLastTime; + private Date creatime; + private Date updateTime; + private String salt; + private String status; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java new file mode 100644 index 0000000..f29d19b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUser; + +public interface AppUserMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java new file mode 100644 index 0000000..b3e0014 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.WellPreAdd; + +public interface WellPreAddMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java new file mode 100644 index 0000000..1541c19 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -0,0 +1,22 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * @author cz + */ +@Data +@TableName("app_product_safe") +public class AppProductSafe { + + private Long id; + private Long projectId; + private String signImage; + private String signName; + private Date signTime; + private Date creatime; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java new file mode 100644 index 0000000..0d83ff7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +@TableName("app_user") +@Data +public class AppUser { + private Long id; + private String acount; + private String password; + private String name; + private String phone; + private String projectId; + private String attr; + @TableField("attr_alias") + private String attrAlias; + private String role; + private String openId; + private Date labelLastTime; + private Date creatime; + private Date updateTime; + private String salt; + private String status; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java new file mode 100644 index 0000000..1fbbdd0 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 井盖信息预录入 + * @author cz + */ +@Data +@TableName("app_pre_add") +public class WellPreAdd { + + private Long id; + @TableField("well_code") + private String wellCode; + @TableField("well_name") + private String wellName; + @TableField("well_type") + private String wellType; + private String position; + private String projectId; + private Date createTime; + @TableField("is_del") + private String isDel; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java new file mode 100644 index 0000000..f29d19b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUser; + +public interface AppUserMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java new file mode 100644 index 0000000..b3e0014 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.WellPreAdd; + +public interface WellPreAddMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java new file mode 100644 index 0000000..1541c19 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -0,0 +1,22 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * @author cz + */ +@Data +@TableName("app_product_safe") +public class AppProductSafe { + + private Long id; + private Long projectId; + private String signImage; + private String signName; + private Date signTime; + private Date creatime; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java new file mode 100644 index 0000000..0d83ff7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +@TableName("app_user") +@Data +public class AppUser { + private Long id; + private String acount; + private String password; + private String name; + private String phone; + private String projectId; + private String attr; + @TableField("attr_alias") + private String attrAlias; + private String role; + private String openId; + private Date labelLastTime; + private Date creatime; + private Date updateTime; + private String salt; + private String status; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java new file mode 100644 index 0000000..1fbbdd0 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 井盖信息预录入 + * @author cz + */ +@Data +@TableName("app_pre_add") +public class WellPreAdd { + + private Long id; + @TableField("well_code") + private String wellCode; + @TableField("well_name") + private String wellName; + @TableField("well_type") + private String wellType; + private String position; + private String projectId; + private Date createTime; + @TableField("is_del") + private String isDel; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java new file mode 100644 index 0000000..0aeb314 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +public interface IAppProuctionSafeService { + + Object listPage(); + + /** + * 安全生产更新 + */ + Object getTodaySignStatus(); + + /** + * 安全生产更新 + */ + Object update(); + + /** + * 安全生产新增 + */ + Object add(); + + /** + * 安全生产详情信息 + */ + Object detail(); + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java new file mode 100644 index 0000000..f29d19b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUser; + +public interface AppUserMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java new file mode 100644 index 0000000..b3e0014 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.WellPreAdd; + +public interface WellPreAddMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java new file mode 100644 index 0000000..1541c19 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -0,0 +1,22 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * @author cz + */ +@Data +@TableName("app_product_safe") +public class AppProductSafe { + + private Long id; + private Long projectId; + private String signImage; + private String signName; + private Date signTime; + private Date creatime; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java new file mode 100644 index 0000000..0d83ff7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +@TableName("app_user") +@Data +public class AppUser { + private Long id; + private String acount; + private String password; + private String name; + private String phone; + private String projectId; + private String attr; + @TableField("attr_alias") + private String attrAlias; + private String role; + private String openId; + private Date labelLastTime; + private Date creatime; + private Date updateTime; + private String salt; + private String status; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java new file mode 100644 index 0000000..1fbbdd0 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 井盖信息预录入 + * @author cz + */ +@Data +@TableName("app_pre_add") +public class WellPreAdd { + + private Long id; + @TableField("well_code") + private String wellCode; + @TableField("well_name") + private String wellName; + @TableField("well_type") + private String wellType; + private String position; + private String projectId; + private Date createTime; + @TableField("is_del") + private String isDel; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java new file mode 100644 index 0000000..0aeb314 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +public interface IAppProuctionSafeService { + + Object listPage(); + + /** + * 安全生产更新 + */ + Object getTodaySignStatus(); + + /** + * 安全生产更新 + */ + Object update(); + + /** + * 安全生产新增 + */ + Object add(); + + /** + * 安全生产详情信息 + */ + Object detail(); + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 98da591..0c49f02 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -1,4 +1,21 @@ package com.casic.missiles.modular.app.service; public interface IAppUserService { + + Object login(); + + Object listPage(); + + Object add(); + + Object update(); + + Object project(); + + Object unbind(); + + Object batchImport(); + + Object delete(); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java new file mode 100644 index 0000000..f29d19b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUser; + +public interface AppUserMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java new file mode 100644 index 0000000..b3e0014 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.WellPreAdd; + +public interface WellPreAddMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java new file mode 100644 index 0000000..1541c19 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -0,0 +1,22 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * @author cz + */ +@Data +@TableName("app_product_safe") +public class AppProductSafe { + + private Long id; + private Long projectId; + private String signImage; + private String signName; + private Date signTime; + private Date creatime; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java new file mode 100644 index 0000000..0d83ff7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +@TableName("app_user") +@Data +public class AppUser { + private Long id; + private String acount; + private String password; + private String name; + private String phone; + private String projectId; + private String attr; + @TableField("attr_alias") + private String attrAlias; + private String role; + private String openId; + private Date labelLastTime; + private Date creatime; + private Date updateTime; + private String salt; + private String status; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java new file mode 100644 index 0000000..1fbbdd0 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 井盖信息预录入 + * @author cz + */ +@Data +@TableName("app_pre_add") +public class WellPreAdd { + + private Long id; + @TableField("well_code") + private String wellCode; + @TableField("well_name") + private String wellName; + @TableField("well_type") + private String wellType; + private String position; + private String projectId; + private Date createTime; + @TableField("is_del") + private String isDel; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java new file mode 100644 index 0000000..0aeb314 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +public interface IAppProuctionSafeService { + + Object listPage(); + + /** + * 安全生产更新 + */ + Object getTodaySignStatus(); + + /** + * 安全生产更新 + */ + Object update(); + + /** + * 安全生产新增 + */ + Object add(); + + /** + * 安全生产详情信息 + */ + Object detail(); + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 98da591..0c49f02 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -1,4 +1,21 @@ package com.casic.missiles.modular.app.service; public interface IAppUserService { + + Object login(); + + Object listPage(); + + Object add(); + + Object update(); + + Object project(); + + Object unbind(); + + Object batchImport(); + + Object delete(); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java new file mode 100644 index 0000000..a656f48 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +public interface IAppWellPreService { + + Object listPage(); + + /** + * 预录入点位信息新增 + */ + Object add(); + + + /** + * 预录入点位信息批量导入 + */ + Object batchImport(); + + /** + * 预录入点位信息编辑 + */ + Object update(); + + /** + * 预录入点位信息删除 + */ + Object delete(); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java new file mode 100644 index 0000000..f29d19b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUser; + +public interface AppUserMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java new file mode 100644 index 0000000..b3e0014 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.WellPreAdd; + +public interface WellPreAddMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java new file mode 100644 index 0000000..1541c19 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -0,0 +1,22 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * @author cz + */ +@Data +@TableName("app_product_safe") +public class AppProductSafe { + + private Long id; + private Long projectId; + private String signImage; + private String signName; + private Date signTime; + private Date creatime; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java new file mode 100644 index 0000000..0d83ff7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +@TableName("app_user") +@Data +public class AppUser { + private Long id; + private String acount; + private String password; + private String name; + private String phone; + private String projectId; + private String attr; + @TableField("attr_alias") + private String attrAlias; + private String role; + private String openId; + private Date labelLastTime; + private Date creatime; + private Date updateTime; + private String salt; + private String status; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java new file mode 100644 index 0000000..1fbbdd0 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 井盖信息预录入 + * @author cz + */ +@Data +@TableName("app_pre_add") +public class WellPreAdd { + + private Long id; + @TableField("well_code") + private String wellCode; + @TableField("well_name") + private String wellName; + @TableField("well_type") + private String wellType; + private String position; + private String projectId; + private Date createTime; + @TableField("is_del") + private String isDel; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java new file mode 100644 index 0000000..0aeb314 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +public interface IAppProuctionSafeService { + + Object listPage(); + + /** + * 安全生产更新 + */ + Object getTodaySignStatus(); + + /** + * 安全生产更新 + */ + Object update(); + + /** + * 安全生产新增 + */ + Object add(); + + /** + * 安全生产详情信息 + */ + Object detail(); + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 98da591..0c49f02 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -1,4 +1,21 @@ package com.casic.missiles.modular.app.service; public interface IAppUserService { + + Object login(); + + Object listPage(); + + Object add(); + + Object update(); + + Object project(); + + Object unbind(); + + Object batchImport(); + + Object delete(); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java new file mode 100644 index 0000000..a656f48 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +public interface IAppWellPreService { + + Object listPage(); + + /** + * 预录入点位信息新增 + */ + Object add(); + + + /** + * 预录入点位信息批量导入 + */ + Object batchImport(); + + /** + * 预录入点位信息编辑 + */ + Object update(); + + /** + * 预录入点位信息删除 + */ + Object delete(); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProuctionSafeServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProuctionSafeServiceImpl.java new file mode 100644 index 0000000..763c8c9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProuctionSafeServiceImpl.java @@ -0,0 +1,37 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppProductSafeMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import org.springframework.stereotype.Service; + +@Service +public class AppProuctionSafeServiceImpl extends ServiceImpl implements IAppProuctionSafeService { + + + @Override + public Object listPage() { + return null; + } + + @Override + public Object getTodaySignStatus() { + return null; + } + + @Override + public Object update() { + return null; + } + + @Override + public Object add() { + return null; + } + + @Override + public Object detail() { + return null; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java new file mode 100644 index 0000000..f29d19b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUser; + +public interface AppUserMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java new file mode 100644 index 0000000..b3e0014 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.WellPreAdd; + +public interface WellPreAddMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java new file mode 100644 index 0000000..1541c19 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -0,0 +1,22 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * @author cz + */ +@Data +@TableName("app_product_safe") +public class AppProductSafe { + + private Long id; + private Long projectId; + private String signImage; + private String signName; + private Date signTime; + private Date creatime; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java new file mode 100644 index 0000000..0d83ff7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +@TableName("app_user") +@Data +public class AppUser { + private Long id; + private String acount; + private String password; + private String name; + private String phone; + private String projectId; + private String attr; + @TableField("attr_alias") + private String attrAlias; + private String role; + private String openId; + private Date labelLastTime; + private Date creatime; + private Date updateTime; + private String salt; + private String status; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java new file mode 100644 index 0000000..1fbbdd0 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 井盖信息预录入 + * @author cz + */ +@Data +@TableName("app_pre_add") +public class WellPreAdd { + + private Long id; + @TableField("well_code") + private String wellCode; + @TableField("well_name") + private String wellName; + @TableField("well_type") + private String wellType; + private String position; + private String projectId; + private Date createTime; + @TableField("is_del") + private String isDel; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java new file mode 100644 index 0000000..0aeb314 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +public interface IAppProuctionSafeService { + + Object listPage(); + + /** + * 安全生产更新 + */ + Object getTodaySignStatus(); + + /** + * 安全生产更新 + */ + Object update(); + + /** + * 安全生产新增 + */ + Object add(); + + /** + * 安全生产详情信息 + */ + Object detail(); + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 98da591..0c49f02 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -1,4 +1,21 @@ package com.casic.missiles.modular.app.service; public interface IAppUserService { + + Object login(); + + Object listPage(); + + Object add(); + + Object update(); + + Object project(); + + Object unbind(); + + Object batchImport(); + + Object delete(); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java new file mode 100644 index 0000000..a656f48 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +public interface IAppWellPreService { + + Object listPage(); + + /** + * 预录入点位信息新增 + */ + Object add(); + + + /** + * 预录入点位信息批量导入 + */ + Object batchImport(); + + /** + * 预录入点位信息编辑 + */ + Object update(); + + /** + * 预录入点位信息删除 + */ + Object delete(); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProuctionSafeServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProuctionSafeServiceImpl.java new file mode 100644 index 0000000..763c8c9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProuctionSafeServiceImpl.java @@ -0,0 +1,37 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppProductSafeMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import org.springframework.stereotype.Service; + +@Service +public class AppProuctionSafeServiceImpl extends ServiceImpl implements IAppProuctionSafeService { + + + @Override + public Object listPage() { + return null; + } + + @Override + public Object getTodaySignStatus() { + return null; + } + + @Override + public Object update() { + return null; + } + + @Override + public Object add() { + return null; + } + + @Override + public Object detail() { + return null; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java new file mode 100644 index 0000000..51b1a6d --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java @@ -0,0 +1,49 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.casic.missiles.modular.app.service.IAppUserService; +import org.springframework.stereotype.Service; + +@Service +public class AppUserServiceImpl implements IAppUserService { + + + @Override + public Object login() { + return null; + } + + @Override + public Object listPage() { + return null; + } + + @Override + public Object add() { + return null; + } + + @Override + public Object update() { + return null; + } + + @Override + public Object project() { + return null; + } + + @Override + public Object unbind() { + return null; + } + + @Override + public Object batchImport() { + return null; + } + + @Override + public Object delete() { + return null; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java index a754d5f..5b2ad70 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -1,15 +1,20 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +@AllArgsConstructor @RestController @RequestMapping("/prouction/safe") -public class AppProuctionSafeController { +public class AppProuctionSafeController extends BaseController { + private final IAppProuctionSafeService proucteSafeService; /** * 安全生产分页列表 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 7d1042a..a536e39 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -1,7 +1,7 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.app.model.AppUserOpenid; import com.casic.missiles.modular.app.service.IAppUserService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +11,7 @@ @RestController @AllArgsConstructor @RequestMapping("/app/user") -public class AppUserController { +public class AppUserController extends BaseController { private final IAppUserService appUserService; @@ -23,7 +23,6 @@ return ResponseData.success(); } - /** * 分页列表 */ @@ -33,7 +32,6 @@ return ResponseData.success(); } - /** * 新增 */ @@ -52,7 +50,6 @@ return ResponseData.success(); } - /** * 解除绑定 */ @@ -71,7 +68,6 @@ return ResponseData.success(); } - /** * 编辑 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java index 32bfb6b..879f683 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.app.controller; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.app.service.IAppWellPreService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @RestController +@AllArgsConstructor @RequestMapping("/well/pre") -public class AppWellPreController { +public class AppWellPreController extends BaseController { + private final IAppWellPreService appWellPreService; /** * 预录入点位信息列表 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java new file mode 100644 index 0000000..6f7549b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppProductSafeMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; + +public interface AppProductSafeMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java new file mode 100644 index 0000000..f29d19b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUser; + +public interface AppUserMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java new file mode 100644 index 0000000..b3e0014 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/WellPreAddMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.WellPreAdd; + +public interface WellPreAddMapper extends BaseMapper { +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java new file mode 100644 index 0000000..1541c19 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppProductSafe.java @@ -0,0 +1,22 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * @author cz + */ +@Data +@TableName("app_product_safe") +public class AppProductSafe { + + private Long id; + private Long projectId; + private String signImage; + private String signName; + private Date signTime; + private Date creatime; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java new file mode 100644 index 0000000..0d83ff7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +@TableName("app_user") +@Data +public class AppUser { + private Long id; + private String acount; + private String password; + private String name; + private String phone; + private String projectId; + private String attr; + @TableField("attr_alias") + private String attrAlias; + private String role; + private String openId; + private Date labelLastTime; + private Date creatime; + private Date updateTime; + private String salt; + private String status; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java new file mode 100644 index 0000000..1fbbdd0 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.app.model; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 井盖信息预录入 + * @author cz + */ +@Data +@TableName("app_pre_add") +public class WellPreAdd { + + private Long id; + @TableField("well_code") + private String wellCode; + @TableField("well_name") + private String wellName; + @TableField("well_type") + private String wellType; + private String position; + private String projectId; + private Date createTime; + @TableField("is_del") + private String isDel; + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java new file mode 100644 index 0000000..0aeb314 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppProuctionSafeService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +public interface IAppProuctionSafeService { + + Object listPage(); + + /** + * 安全生产更新 + */ + Object getTodaySignStatus(); + + /** + * 安全生产更新 + */ + Object update(); + + /** + * 安全生产新增 + */ + Object add(); + + /** + * 安全生产详情信息 + */ + Object detail(); + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 98da591..0c49f02 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -1,4 +1,21 @@ package com.casic.missiles.modular.app.service; public interface IAppUserService { + + Object login(); + + Object listPage(); + + Object add(); + + Object update(); + + Object project(); + + Object unbind(); + + Object batchImport(); + + Object delete(); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java new file mode 100644 index 0000000..a656f48 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppWellPreService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +public interface IAppWellPreService { + + Object listPage(); + + /** + * 预录入点位信息新增 + */ + Object add(); + + + /** + * 预录入点位信息批量导入 + */ + Object batchImport(); + + /** + * 预录入点位信息编辑 + */ + Object update(); + + /** + * 预录入点位信息删除 + */ + Object delete(); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProuctionSafeServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProuctionSafeServiceImpl.java new file mode 100644 index 0000000..763c8c9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProuctionSafeServiceImpl.java @@ -0,0 +1,37 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppProductSafeMapper; +import com.casic.missiles.modular.app.model.AppProductSafe; +import com.casic.missiles.modular.app.service.IAppProuctionSafeService; +import org.springframework.stereotype.Service; + +@Service +public class AppProuctionSafeServiceImpl extends ServiceImpl implements IAppProuctionSafeService { + + + @Override + public Object listPage() { + return null; + } + + @Override + public Object getTodaySignStatus() { + return null; + } + + @Override + public Object update() { + return null; + } + + @Override + public Object add() { + return null; + } + + @Override + public Object detail() { + return null; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java new file mode 100644 index 0000000..51b1a6d --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java @@ -0,0 +1,49 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.casic.missiles.modular.app.service.IAppUserService; +import org.springframework.stereotype.Service; + +@Service +public class AppUserServiceImpl implements IAppUserService { + + + @Override + public Object login() { + return null; + } + + @Override + public Object listPage() { + return null; + } + + @Override + public Object add() { + return null; + } + + @Override + public Object update() { + return null; + } + + @Override + public Object project() { + return null; + } + + @Override + public Object unbind() { + return null; + } + + @Override + public Object batchImport() { + return null; + } + + @Override + public Object delete() { + return null; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppWellPreServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppWellPreServiceImpl.java new file mode 100644 index 0000000..8bc52d5 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppWellPreServiceImpl.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.casic.missiles.modular.app.service.IAppWellPreService; +import org.springframework.stereotype.Service; + +@Service +public class AppWellPreServiceImpl implements IAppWellPreService { + + + @Override + public Object listPage() { + return null; + } + + @Override + public Object add() { + return null; + } + + @Override + public Object batchImport() { + return null; + } + + @Override + public Object update() { + return null; + } + + @Override + public Object delete() { + return null; + } + + +}