diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java deleted file mode 100644 index ebff04e..0000000 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.casic.missiles.modular.app.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * app接口 - * @author dev - * @Date 2020-05-21 15:29:55 - */ -@Controller -@RequestMapping("/app") -public class AppController extends BaseController { - - /** - * 登录接口 - */ - @RequestMapping(value = "/login") - @ResponseBody - @Transactional - public Object login() { - - return null; - - } - - - /** - * 首页显示 - */ - @RequestMapping(value = "/showDevice") - @ResponseBody - public Object showDevice(String devcode,String installDate, - String devtype,String wellcode, - String factory) { - - return null; - - } - -} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java deleted file mode 100644 index ebff04e..0000000 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.casic.missiles.modular.app.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * app接口 - * @author dev - * @Date 2020-05-21 15:29:55 - */ -@Controller -@RequestMapping("/app") -public class AppController extends BaseController { - - /** - * 登录接口 - */ - @RequestMapping(value = "/login") - @ResponseBody - @Transactional - public Object login() { - - return null; - - } - - - /** - * 首页显示 - */ - @RequestMapping(value = "/showDevice") - @ResponseBody - public Object showDevice(String devcode,String installDate, - String devtype,String wellcode, - String factory) { - - return null; - - } - -} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index cbfaa4d..297ff63 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -257,7 +257,7 @@ Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); - return ResponseData.success("执行成功，请稍等..."); + return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); } else { return ResponseData.error("有任务正在执行，请稍等!"); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java deleted file mode 100644 index ebff04e..0000000 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.casic.missiles.modular.app.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * app接口 - * @author dev - * @Date 2020-05-21 15:29:55 - */ -@Controller -@RequestMapping("/app") -public class AppController extends BaseController { - - /** - * 登录接口 - */ - @RequestMapping(value = "/login") - @ResponseBody - @Transactional - public Object login() { - - return null; - - } - - - /** - * 首页显示 - */ - @RequestMapping(value = "/showDevice") - @ResponseBody - public Object showDevice(String devcode,String installDate, - String devtype,String wellcode, - String factory) { - - return null; - - } - -} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index cbfaa4d..297ff63 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -257,7 +257,7 @@ Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); - return ResponseData.success("执行成功，请稍等..."); + return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); } else { return ResponseData.error("有任务正在执行，请稍等!"); } 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 new file mode 100644 index 0000000..a754d5f --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -0,0 +1,59 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/prouction/safe") +public class AppProuctionSafeController { + + + /** + * 安全生产分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + return ResponseData.success(); + } + + /** + * 安全生产更新 + */ + @RequestMapping(value = "/status") + @ResponseBody + public Object getTodaySignStatus() { + return ResponseData.success(); + } + + + /** + * 安全生产更新 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update() { + return ResponseData.success(); + } + + /** + * 安全生产新增 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() { + return ResponseData.success(); + } + + /** + * 安全生产详情信息 + */ + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail() { + return ResponseData.success(); + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java deleted file mode 100644 index ebff04e..0000000 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.casic.missiles.modular.app.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * app接口 - * @author dev - * @Date 2020-05-21 15:29:55 - */ -@Controller -@RequestMapping("/app") -public class AppController extends BaseController { - - /** - * 登录接口 - */ - @RequestMapping(value = "/login") - @ResponseBody - @Transactional - public Object login() { - - return null; - - } - - - /** - * 首页显示 - */ - @RequestMapping(value = "/showDevice") - @ResponseBody - public Object showDevice(String devcode,String installDate, - String devtype,String wellcode, - String factory) { - - return null; - - } - -} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index cbfaa4d..297ff63 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -257,7 +257,7 @@ Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); - return ResponseData.success("执行成功，请稍等..."); + return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); } else { return ResponseData.error("有任务正在执行，请稍等!"); } 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 new file mode 100644 index 0000000..a754d5f --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -0,0 +1,59 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/prouction/safe") +public class AppProuctionSafeController { + + + /** + * 安全生产分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + return ResponseData.success(); + } + + /** + * 安全生产更新 + */ + @RequestMapping(value = "/status") + @ResponseBody + public Object getTodaySignStatus() { + return ResponseData.success(); + } + + + /** + * 安全生产更新 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update() { + return ResponseData.success(); + } + + /** + * 安全生产新增 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() { + return ResponseData.success(); + } + + /** + * 安全生产详情信息 + */ + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail() { + return ResponseData.success(); + } +} 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 84b21df..7d1042a 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,14 +1,93 @@ package com.casic.missiles.modular.app.controller; -import org.springframework.stereotype.Controller; +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; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController +@AllArgsConstructor @RequestMapping("/app/user") public class AppUserController { + private final IAppUserService appUserService; + + /** + * 登录之后进行绑定 + */ + @RequestMapping(value = "/login") + public Object login() { + return ResponseData.success(); + } + /** + * 分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + return ResponseData.success(); + } + /** + * 新增 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() { + return ResponseData.success(); + } + + /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/project") + @ResponseBody + public Object project() { + return ResponseData.success(); + } + + + /** + * 解除绑定 + */ + @RequestMapping(value = "/unbind") + @ResponseBody + public Object unbind() { + return ResponseData.success(); + } + + /** + * 批量导入 + */ + @RequestMapping(value = "/batchImport") + @ResponseBody + public Object batchImport() { + return ResponseData.success(); + } + + + /** + * 编辑 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update() { + return ResponseData.success(); + } + + /** + * 删除 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete() { + return ResponseData.success(); + } + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java deleted file mode 100644 index ebff04e..0000000 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.casic.missiles.modular.app.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * app接口 - * @author dev - * @Date 2020-05-21 15:29:55 - */ -@Controller -@RequestMapping("/app") -public class AppController extends BaseController { - - /** - * 登录接口 - */ - @RequestMapping(value = "/login") - @ResponseBody - @Transactional - public Object login() { - - return null; - - } - - - /** - * 首页显示 - */ - @RequestMapping(value = "/showDevice") - @ResponseBody - public Object showDevice(String devcode,String installDate, - String devtype,String wellcode, - String factory) { - - return null; - - } - -} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index cbfaa4d..297ff63 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -257,7 +257,7 @@ Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); - return ResponseData.success("执行成功，请稍等..."); + return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); } else { return ResponseData.error("有任务正在执行，请稍等!"); } 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 new file mode 100644 index 0000000..a754d5f --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -0,0 +1,59 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/prouction/safe") +public class AppProuctionSafeController { + + + /** + * 安全生产分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + return ResponseData.success(); + } + + /** + * 安全生产更新 + */ + @RequestMapping(value = "/status") + @ResponseBody + public Object getTodaySignStatus() { + return ResponseData.success(); + } + + + /** + * 安全生产更新 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update() { + return ResponseData.success(); + } + + /** + * 安全生产新增 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() { + return ResponseData.success(); + } + + /** + * 安全生产详情信息 + */ + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail() { + return ResponseData.success(); + } +} 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 84b21df..7d1042a 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,14 +1,93 @@ package com.casic.missiles.modular.app.controller; -import org.springframework.stereotype.Controller; +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; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController +@AllArgsConstructor @RequestMapping("/app/user") public class AppUserController { + private final IAppUserService appUserService; + + /** + * 登录之后进行绑定 + */ + @RequestMapping(value = "/login") + public Object login() { + return ResponseData.success(); + } + /** + * 分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + return ResponseData.success(); + } + /** + * 新增 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() { + return ResponseData.success(); + } + + /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/project") + @ResponseBody + public Object project() { + return ResponseData.success(); + } + + + /** + * 解除绑定 + */ + @RequestMapping(value = "/unbind") + @ResponseBody + public Object unbind() { + return ResponseData.success(); + } + + /** + * 批量导入 + */ + @RequestMapping(value = "/batchImport") + @ResponseBody + public Object batchImport() { + return ResponseData.success(); + } + + + /** + * 编辑 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update() { + return ResponseData.success(); + } + + /** + * 删除 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete() { + return ResponseData.success(); + } + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 174f4f0..f686fcd 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -46,63 +46,6 @@ private String secretWx; /** - * 获取授权列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return appUserOpenidService.selectList(null); - } - - /** - * 获取授权分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = appUserOpenidService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增授权 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(AppUserOpenid appUserOpenid) { - EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid", appUserOpenid.getOpenid()); -// appUserOpenid.delete(ew); - if (ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))) { - return ResponseData.success("已授权"); - } - appUserOpenidService.insert(appUserOpenid); - return ResponseData.success("授权成功"); - } - - /** - * 删除授权 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String appUserOpenidId) { - appUserOpenidService.deleteById(appUserOpenidId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("appUserOpenidIds") List appUserOpenidIds) { - appUserOpenidService.deleteBatchIds(appUserOpenidIds); - return ResponseData.success(); - } - - /** * 修改登录信息 */ @RequestMapping(value = "/update") @@ -112,6 +55,13 @@ return ResponseData.success(); } + /** + * + * @param appid + * @param secret + * @param code + * @return + */ @RequestMapping(value = "/login") @ResponseBody public Object login(String appid, String secret, String code) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java deleted file mode 100644 index ebff04e..0000000 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.casic.missiles.modular.app.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * app接口 - * @author dev - * @Date 2020-05-21 15:29:55 - */ -@Controller -@RequestMapping("/app") -public class AppController extends BaseController { - - /** - * 登录接口 - */ - @RequestMapping(value = "/login") - @ResponseBody - @Transactional - public Object login() { - - return null; - - } - - - /** - * 首页显示 - */ - @RequestMapping(value = "/showDevice") - @ResponseBody - public Object showDevice(String devcode,String installDate, - String devtype,String wellcode, - String factory) { - - return null; - - } - -} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index cbfaa4d..297ff63 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -257,7 +257,7 @@ Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); - return ResponseData.success("执行成功，请稍等..."); + return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); } else { return ResponseData.error("有任务正在执行，请稍等!"); } 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 new file mode 100644 index 0000000..a754d5f --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -0,0 +1,59 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/prouction/safe") +public class AppProuctionSafeController { + + + /** + * 安全生产分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + return ResponseData.success(); + } + + /** + * 安全生产更新 + */ + @RequestMapping(value = "/status") + @ResponseBody + public Object getTodaySignStatus() { + return ResponseData.success(); + } + + + /** + * 安全生产更新 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update() { + return ResponseData.success(); + } + + /** + * 安全生产新增 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() { + return ResponseData.success(); + } + + /** + * 安全生产详情信息 + */ + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail() { + return ResponseData.success(); + } +} 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 84b21df..7d1042a 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,14 +1,93 @@ package com.casic.missiles.modular.app.controller; -import org.springframework.stereotype.Controller; +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; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController +@AllArgsConstructor @RequestMapping("/app/user") public class AppUserController { + private final IAppUserService appUserService; + + /** + * 登录之后进行绑定 + */ + @RequestMapping(value = "/login") + public Object login() { + return ResponseData.success(); + } + /** + * 分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + return ResponseData.success(); + } + /** + * 新增 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() { + return ResponseData.success(); + } + + /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/project") + @ResponseBody + public Object project() { + return ResponseData.success(); + } + + + /** + * 解除绑定 + */ + @RequestMapping(value = "/unbind") + @ResponseBody + public Object unbind() { + return ResponseData.success(); + } + + /** + * 批量导入 + */ + @RequestMapping(value = "/batchImport") + @ResponseBody + public Object batchImport() { + return ResponseData.success(); + } + + + /** + * 编辑 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update() { + return ResponseData.success(); + } + + /** + * 删除 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete() { + return ResponseData.success(); + } + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 174f4f0..f686fcd 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -46,63 +46,6 @@ private String secretWx; /** - * 获取授权列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return appUserOpenidService.selectList(null); - } - - /** - * 获取授权分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = appUserOpenidService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增授权 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(AppUserOpenid appUserOpenid) { - EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid", appUserOpenid.getOpenid()); -// appUserOpenid.delete(ew); - if (ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))) { - return ResponseData.success("已授权"); - } - appUserOpenidService.insert(appUserOpenid); - return ResponseData.success("授权成功"); - } - - /** - * 删除授权 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String appUserOpenidId) { - appUserOpenidService.deleteById(appUserOpenidId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("appUserOpenidIds") List appUserOpenidIds) { - appUserOpenidService.deleteBatchIds(appUserOpenidIds); - return ResponseData.success(); - } - - /** * 修改登录信息 */ @RequestMapping(value = "/update") @@ -112,6 +55,13 @@ return ResponseData.success(); } + /** + * + * @param appid + * @param secret + * @param code + * @return + */ @RequestMapping(value = "/login") @ResponseBody public Object login(String appid, String secret, String code) { 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 new file mode 100644 index 0000000..32bfb6b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -0,0 +1,58 @@ +package com.casic.missiles.modular.app.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/well/pre") +public class AppWellPreController { + + /** + * 预录入点位信息列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + return ResponseData.success(); + } + + /** + * 预录入点位信息新增 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() { + return ResponseData.success(); + } + + + /** + * 预录入点位信息批量导入 + */ + @RequestMapping(value = "/batchImport") + @ResponseBody + public Object batchImport() { + return ResponseData.success(); + } + + /** + * 预录入点位信息编辑 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update() { + return ResponseData.success(); + } + + /** + * 预录入点位信息删除 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete() { + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java deleted file mode 100644 index ebff04e..0000000 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.casic.missiles.modular.app.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * app接口 - * @author dev - * @Date 2020-05-21 15:29:55 - */ -@Controller -@RequestMapping("/app") -public class AppController extends BaseController { - - /** - * 登录接口 - */ - @RequestMapping(value = "/login") - @ResponseBody - @Transactional - public Object login() { - - return null; - - } - - - /** - * 首页显示 - */ - @RequestMapping(value = "/showDevice") - @ResponseBody - public Object showDevice(String devcode,String installDate, - String devtype,String wellcode, - String factory) { - - return null; - - } - -} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index cbfaa4d..297ff63 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -257,7 +257,7 @@ Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); - return ResponseData.success("执行成功，请稍等..."); + return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); } else { return ResponseData.error("有任务正在执行，请稍等!"); } 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 new file mode 100644 index 0000000..a754d5f --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppProuctionSafeController.java @@ -0,0 +1,59 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/prouction/safe") +public class AppProuctionSafeController { + + + /** + * 安全生产分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + return ResponseData.success(); + } + + /** + * 安全生产更新 + */ + @RequestMapping(value = "/status") + @ResponseBody + public Object getTodaySignStatus() { + return ResponseData.success(); + } + + + /** + * 安全生产更新 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update() { + return ResponseData.success(); + } + + /** + * 安全生产新增 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() { + return ResponseData.success(); + } + + /** + * 安全生产详情信息 + */ + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail() { + return ResponseData.success(); + } +} 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 84b21df..7d1042a 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,14 +1,93 @@ package com.casic.missiles.modular.app.controller; -import org.springframework.stereotype.Controller; +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; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController +@AllArgsConstructor @RequestMapping("/app/user") public class AppUserController { + private final IAppUserService appUserService; + + /** + * 登录之后进行绑定 + */ + @RequestMapping(value = "/login") + public Object login() { + return ResponseData.success(); + } + /** + * 分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + return ResponseData.success(); + } + /** + * 新增 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() { + return ResponseData.success(); + } + + /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/project") + @ResponseBody + public Object project() { + return ResponseData.success(); + } + + + /** + * 解除绑定 + */ + @RequestMapping(value = "/unbind") + @ResponseBody + public Object unbind() { + return ResponseData.success(); + } + + /** + * 批量导入 + */ + @RequestMapping(value = "/batchImport") + @ResponseBody + public Object batchImport() { + return ResponseData.success(); + } + + + /** + * 编辑 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update() { + return ResponseData.success(); + } + + /** + * 删除 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete() { + return ResponseData.success(); + } + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index 174f4f0..f686fcd 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -46,63 +46,6 @@ private String secretWx; /** - * 获取授权列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return appUserOpenidService.selectList(null); - } - - /** - * 获取授权分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = appUserOpenidService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增授权 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(AppUserOpenid appUserOpenid) { - EntityWrapper ew = new EntityWrapper<>(); - ew.eq("openid", appUserOpenid.getOpenid()); -// appUserOpenid.delete(ew); - if (ToolUtil.isNotEmpty(appUserOpenidService.selectList(ew))) { - return ResponseData.success("已授权"); - } - appUserOpenidService.insert(appUserOpenid); - return ResponseData.success("授权成功"); - } - - /** - * 删除授权 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String appUserOpenidId) { - appUserOpenidService.deleteById(appUserOpenidId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("appUserOpenidIds") List appUserOpenidIds) { - appUserOpenidService.deleteBatchIds(appUserOpenidIds); - return ResponseData.success(); - } - - /** * 修改登录信息 */ @RequestMapping(value = "/update") @@ -112,6 +55,13 @@ return ResponseData.success(); } + /** + * + * @param appid + * @param secret + * @param code + * @return + */ @RequestMapping(value = "/login") @ResponseBody public Object login(String appid, String secret, String code) { 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 new file mode 100644 index 0000000..32bfb6b --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppWellPreController.java @@ -0,0 +1,58 @@ +package com.casic.missiles.modular.app.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/well/pre") +public class AppWellPreController { + + /** + * 预录入点位信息列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + return ResponseData.success(); + } + + /** + * 预录入点位信息新增 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() { + return ResponseData.success(); + } + + + /** + * 预录入点位信息批量导入 + */ + @RequestMapping(value = "/batchImport") + @ResponseBody + public Object batchImport() { + return ResponseData.success(); + } + + /** + * 预录入点位信息编辑 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update() { + return ResponseData.success(); + } + + /** + * 预录入点位信息删除 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete() { + return ResponseData.success(); + } + +} 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 new file mode 100644 index 0000000..98da591 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -0,0 +1,4 @@ +package com.casic.missiles.modular.app.service; + +public interface IAppUserService { +}