diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + return ResponseData.success(); + } + + +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java deleted file mode 100644 index 341d3d1..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 批次控制器 - * - * @author dev - * @Date 2020-03-27 15:29:55 - */ -@Controller -@RequestMapping("/batch") -public class BatchController extends BaseController { - - - @Autowired - private IBatchService batchService; - - - /** - * 获取批次列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return batchService.selectList(null); - } - - /** - * 获取批次分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = batchService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增批次并生成设备 - */ - @RequestMapping(value = "/add") - @ResponseBody - @Transactional - public Object add(@RequestBody List batches, Task task) { - - return batchService.addBatchAndDevices(batches,task); - - } - - /** - * 删除批次 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String batchId) { - batchService.deleteById(batchId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("batchIds") List batchIds) { - batchService.deleteBatchIds(batchIds); - return ResponseData.success(); - } - - /** - * 修改批次 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Batch batch) { - batchService.updateById(batch); - return ResponseData.success(); - } - - - /** - * 根据设备类型id - * 查找批次号 - */ - @RequestMapping(value = "/getBatchNumber") - @ResponseBody - public Object getBatchNumber(Long devtypeId) { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("devtype_id", devtypeId); - entityWrapper.orderBy("id", false); - Batch batch = batchService.selectOne(entityWrapper); - return ResponseData.success(200, "", batch != null ? batch.getBatchNumber() + 1 : 1); - } - -} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java deleted file mode 100644 index 341d3d1..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 批次控制器 - * - * @author dev - * @Date 2020-03-27 15:29:55 - */ -@Controller -@RequestMapping("/batch") -public class BatchController extends BaseController { - - - @Autowired - private IBatchService batchService; - - - /** - * 获取批次列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return batchService.selectList(null); - } - - /** - * 获取批次分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = batchService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增批次并生成设备 - */ - @RequestMapping(value = "/add") - @ResponseBody - @Transactional - public Object add(@RequestBody List batches, Task task) { - - return batchService.addBatchAndDevices(batches,task); - - } - - /** - * 删除批次 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String batchId) { - batchService.deleteById(batchId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("batchIds") List batchIds) { - batchService.deleteBatchIds(batchIds); - return ResponseData.success(); - } - - /** - * 修改批次 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Batch batch) { - batchService.updateById(batch); - return ResponseData.success(); - } - - - /** - * 根据设备类型id - * 查找批次号 - */ - @RequestMapping(value = "/getBatchNumber") - @ResponseBody - public Object getBatchNumber(Long devtypeId) { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("devtype_id", devtypeId); - entityWrapper.orderBy("id", false); - Batch batch = batchService.selectOne(entityWrapper); - return ResponseData.success(200, "", batch != null ? batch.getBatchNumber() + 1 : 1); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java deleted file mode 100644 index f463168..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.core.util.DateUtil; -import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.ITaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.sql.Timestamp; -import java.util.List; - -/** - * 任务控制器 - * - * @author dev - * @Date 2020-03-27 15:28:26 - */ -@Controller -@RequestMapping("/task") -public class TaskController extends BaseController { - - - @Autowired - private ITaskService taskService; - - - /** - * 获取任务列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return taskService.selectList(null); - } - - /** - * 获取任务分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = taskService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增任务 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.insert(task); - return ResponseData.success(); - } - - /** - * 删除任务 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String taskId) { - taskService.deleteById(taskId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("taskIds") List taskIds) { - taskService.deleteBatchIds(taskIds); - return ResponseData.success(); - } - - /** - * 修改任务 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.updateById(task); - return ResponseData.success(); - } - - -} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java deleted file mode 100644 index 341d3d1..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 批次控制器 - * - * @author dev - * @Date 2020-03-27 15:29:55 - */ -@Controller -@RequestMapping("/batch") -public class BatchController extends BaseController { - - - @Autowired - private IBatchService batchService; - - - /** - * 获取批次列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return batchService.selectList(null); - } - - /** - * 获取批次分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = batchService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增批次并生成设备 - */ - @RequestMapping(value = "/add") - @ResponseBody - @Transactional - public Object add(@RequestBody List batches, Task task) { - - return batchService.addBatchAndDevices(batches,task); - - } - - /** - * 删除批次 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String batchId) { - batchService.deleteById(batchId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("batchIds") List batchIds) { - batchService.deleteBatchIds(batchIds); - return ResponseData.success(); - } - - /** - * 修改批次 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Batch batch) { - batchService.updateById(batch); - return ResponseData.success(); - } - - - /** - * 根据设备类型id - * 查找批次号 - */ - @RequestMapping(value = "/getBatchNumber") - @ResponseBody - public Object getBatchNumber(Long devtypeId) { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("devtype_id", devtypeId); - entityWrapper.orderBy("id", false); - Batch batch = batchService.selectOne(entityWrapper); - return ResponseData.success(200, "", batch != null ? batch.getBatchNumber() + 1 : 1); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java deleted file mode 100644 index f463168..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.core.util.DateUtil; -import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.ITaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.sql.Timestamp; -import java.util.List; - -/** - * 任务控制器 - * - * @author dev - * @Date 2020-03-27 15:28:26 - */ -@Controller -@RequestMapping("/task") -public class TaskController extends BaseController { - - - @Autowired - private ITaskService taskService; - - - /** - * 获取任务列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return taskService.selectList(null); - } - - /** - * 获取任务分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = taskService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增任务 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.insert(task); - return ResponseData.success(); - } - - /** - * 删除任务 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String taskId) { - taskService.deleteById(taskId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("taskIds") List taskIds) { - taskService.deleteBatchIds(taskIds); - return ResponseData.success(); - } - - /** - * 修改任务 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.updateById(task); - return ResponseData.success(); - } - - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java deleted file mode 100644 index 04c7ef8..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.baomidou.mybatisplus.service.IService; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface IBatchService extends IService { - - /** - * 添加批次和生成设备 - * @param batches - * @param task - * @return - */ - ResponseData addBatchAndDevices(List batches, Task task); -} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java deleted file mode 100644 index 341d3d1..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 批次控制器 - * - * @author dev - * @Date 2020-03-27 15:29:55 - */ -@Controller -@RequestMapping("/batch") -public class BatchController extends BaseController { - - - @Autowired - private IBatchService batchService; - - - /** - * 获取批次列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return batchService.selectList(null); - } - - /** - * 获取批次分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = batchService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增批次并生成设备 - */ - @RequestMapping(value = "/add") - @ResponseBody - @Transactional - public Object add(@RequestBody List batches, Task task) { - - return batchService.addBatchAndDevices(batches,task); - - } - - /** - * 删除批次 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String batchId) { - batchService.deleteById(batchId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("batchIds") List batchIds) { - batchService.deleteBatchIds(batchIds); - return ResponseData.success(); - } - - /** - * 修改批次 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Batch batch) { - batchService.updateById(batch); - return ResponseData.success(); - } - - - /** - * 根据设备类型id - * 查找批次号 - */ - @RequestMapping(value = "/getBatchNumber") - @ResponseBody - public Object getBatchNumber(Long devtypeId) { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("devtype_id", devtypeId); - entityWrapper.orderBy("id", false); - Batch batch = batchService.selectOne(entityWrapper); - return ResponseData.success(200, "", batch != null ? batch.getBatchNumber() + 1 : 1); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java deleted file mode 100644 index f463168..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.core.util.DateUtil; -import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.ITaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.sql.Timestamp; -import java.util.List; - -/** - * 任务控制器 - * - * @author dev - * @Date 2020-03-27 15:28:26 - */ -@Controller -@RequestMapping("/task") -public class TaskController extends BaseController { - - - @Autowired - private ITaskService taskService; - - - /** - * 获取任务列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return taskService.selectList(null); - } - - /** - * 获取任务分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = taskService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增任务 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.insert(task); - return ResponseData.success(); - } - - /** - * 删除任务 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String taskId) { - taskService.deleteById(taskId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("taskIds") List taskIds) { - taskService.deleteBatchIds(taskIds); - return ResponseData.success(); - } - - /** - * 修改任务 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.updateById(task); - return ResponseData.success(); - } - - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java deleted file mode 100644 index 04c7ef8..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.baomidou.mybatisplus.service.IService; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface IBatchService extends IService { - - /** - * 添加批次和生成设备 - * @param batches - * @param task - * @return - */ - ResponseData addBatchAndDevices(List batches, Task task); -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java deleted file mode 100644 index 50e1d37..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.casic.missiles.modular.system.model.Task; -import com.baomidou.mybatisplus.service.IService; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface ITaskService extends IService { - -} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java deleted file mode 100644 index 341d3d1..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 批次控制器 - * - * @author dev - * @Date 2020-03-27 15:29:55 - */ -@Controller -@RequestMapping("/batch") -public class BatchController extends BaseController { - - - @Autowired - private IBatchService batchService; - - - /** - * 获取批次列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return batchService.selectList(null); - } - - /** - * 获取批次分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = batchService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增批次并生成设备 - */ - @RequestMapping(value = "/add") - @ResponseBody - @Transactional - public Object add(@RequestBody List batches, Task task) { - - return batchService.addBatchAndDevices(batches,task); - - } - - /** - * 删除批次 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String batchId) { - batchService.deleteById(batchId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("batchIds") List batchIds) { - batchService.deleteBatchIds(batchIds); - return ResponseData.success(); - } - - /** - * 修改批次 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Batch batch) { - batchService.updateById(batch); - return ResponseData.success(); - } - - - /** - * 根据设备类型id - * 查找批次号 - */ - @RequestMapping(value = "/getBatchNumber") - @ResponseBody - public Object getBatchNumber(Long devtypeId) { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("devtype_id", devtypeId); - entityWrapper.orderBy("id", false); - Batch batch = batchService.selectOne(entityWrapper); - return ResponseData.success(200, "", batch != null ? batch.getBatchNumber() + 1 : 1); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java deleted file mode 100644 index f463168..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.core.util.DateUtil; -import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.ITaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.sql.Timestamp; -import java.util.List; - -/** - * 任务控制器 - * - * @author dev - * @Date 2020-03-27 15:28:26 - */ -@Controller -@RequestMapping("/task") -public class TaskController extends BaseController { - - - @Autowired - private ITaskService taskService; - - - /** - * 获取任务列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return taskService.selectList(null); - } - - /** - * 获取任务分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = taskService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增任务 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.insert(task); - return ResponseData.success(); - } - - /** - * 删除任务 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String taskId) { - taskService.deleteById(taskId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("taskIds") List taskIds) { - taskService.deleteBatchIds(taskIds); - return ResponseData.success(); - } - - /** - * 修改任务 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.updateById(task); - return ResponseData.success(); - } - - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java deleted file mode 100644 index 04c7ef8..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.baomidou.mybatisplus.service.IService; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface IBatchService extends IService { - - /** - * 添加批次和生成设备 - * @param batches - * @param task - * @return - */ - ResponseData addBatchAndDevices(List batches, Task task); -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java deleted file mode 100644 index 50e1d37..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.casic.missiles.modular.system.model.Task; -import com.baomidou.mybatisplus.service.IService; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface ITaskService extends IService { - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java deleted file mode 100644 index a435e46..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.device.service.IDeviceService; -import com.casic.missiles.modular.system.dao.BatchMapper; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.ProductDeviceType; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.service.IProductDeviceTypeService; -import com.casic.missiles.modular.system.util.DeviceUtil; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class BatchServiceImpl extends ServiceImpl implements IBatchService { - - @Autowired - private IProductDeviceTypeService deviceTypeService; - @Autowired - private IDeviceService deviceService; - - @Transactional(rollbackFor=Exception.class) - @Override - public ResponseData addBatchAndDevices(List batches, Task task) { - //提交前先验证是否已经存在,若存在且批次号或每批数量改变先删除 - try { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("task_id", task.getTaskId()); - List batchList = this.selectList(entityWrapper); - Map batchMap= new HashMap<>(); - Map batchMap1= new HashMap<>(); - List batchIdlist = new ArrayList<>(); - for (Batch batch : batches) { - batchMap.put(batch.getBatchNumber(),batch.getBatchCount()); - batch.setTaskId(task.getTaskId()); - batch.setDevtypeId(task.getDevtypeId()); - batchIdlist.add(batch.getId()); - } - for (Batch batch : batchList) { - batchMap1.put(batch.getBatchNumber(),batch.getBatchCount()); - } - - //若批次号和数量不变只更新批次表 - if (DeviceUtil.equalMap(batchMap, batchMap1)) { - this.insertOrUpdateBatch(batches); - } - //若批次号和数量更新，更新设备表（删除批次相关的设备后，写入新的设备） - else { - - //验证设备数量是否合格 - ProductDeviceType deviceType = deviceTypeService.selectDeviceTypeByModel(task.getDevmodeId()); - Map resultMap = DeviceUtil.validate(deviceType, batches, task); - if (!Boolean.valueOf(resultMap.get("success").toString())) { - return ResponseData.error(400, resultMap.get("msg").toString()); - } - //删除批次 - EntityWrapper batchEntityWrapper = new EntityWrapper<>(); - batchEntityWrapper.eq("task_id", task.getTaskId()); - this.delete(batchEntityWrapper); - //删除设备 - EntityWrapper deviceEntityWrapper = new EntityWrapper<>(); - deviceEntityWrapper.in("batch_id", batchIdlist); - deviceEntityWrapper.eq("devtype_id",task.getDevtypeId()); - deviceService.delete(deviceEntityWrapper); - - //写入批次 - this.insertBatch(batches); - //写入设备 - List deviceList = DeviceUtil.createDevCodes(deviceType, batches); - deviceService.insertBatch(deviceList); - } - } catch (Exception e) { - e.printStackTrace(); - } - return ResponseData.success(); - } - -} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java deleted file mode 100644 index 341d3d1..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 批次控制器 - * - * @author dev - * @Date 2020-03-27 15:29:55 - */ -@Controller -@RequestMapping("/batch") -public class BatchController extends BaseController { - - - @Autowired - private IBatchService batchService; - - - /** - * 获取批次列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return batchService.selectList(null); - } - - /** - * 获取批次分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = batchService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增批次并生成设备 - */ - @RequestMapping(value = "/add") - @ResponseBody - @Transactional - public Object add(@RequestBody List batches, Task task) { - - return batchService.addBatchAndDevices(batches,task); - - } - - /** - * 删除批次 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String batchId) { - batchService.deleteById(batchId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("batchIds") List batchIds) { - batchService.deleteBatchIds(batchIds); - return ResponseData.success(); - } - - /** - * 修改批次 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Batch batch) { - batchService.updateById(batch); - return ResponseData.success(); - } - - - /** - * 根据设备类型id - * 查找批次号 - */ - @RequestMapping(value = "/getBatchNumber") - @ResponseBody - public Object getBatchNumber(Long devtypeId) { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("devtype_id", devtypeId); - entityWrapper.orderBy("id", false); - Batch batch = batchService.selectOne(entityWrapper); - return ResponseData.success(200, "", batch != null ? batch.getBatchNumber() + 1 : 1); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java deleted file mode 100644 index f463168..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.core.util.DateUtil; -import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.ITaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.sql.Timestamp; -import java.util.List; - -/** - * 任务控制器 - * - * @author dev - * @Date 2020-03-27 15:28:26 - */ -@Controller -@RequestMapping("/task") -public class TaskController extends BaseController { - - - @Autowired - private ITaskService taskService; - - - /** - * 获取任务列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return taskService.selectList(null); - } - - /** - * 获取任务分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = taskService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增任务 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.insert(task); - return ResponseData.success(); - } - - /** - * 删除任务 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String taskId) { - taskService.deleteById(taskId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("taskIds") List taskIds) { - taskService.deleteBatchIds(taskIds); - return ResponseData.success(); - } - - /** - * 修改任务 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.updateById(task); - return ResponseData.success(); - } - - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java deleted file mode 100644 index 04c7ef8..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.baomidou.mybatisplus.service.IService; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface IBatchService extends IService { - - /** - * 添加批次和生成设备 - * @param batches - * @param task - * @return - */ - ResponseData addBatchAndDevices(List batches, Task task); -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java deleted file mode 100644 index 50e1d37..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.casic.missiles.modular.system.model.Task; -import com.baomidou.mybatisplus.service.IService; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface ITaskService extends IService { - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java deleted file mode 100644 index a435e46..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.device.service.IDeviceService; -import com.casic.missiles.modular.system.dao.BatchMapper; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.ProductDeviceType; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.service.IProductDeviceTypeService; -import com.casic.missiles.modular.system.util.DeviceUtil; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class BatchServiceImpl extends ServiceImpl implements IBatchService { - - @Autowired - private IProductDeviceTypeService deviceTypeService; - @Autowired - private IDeviceService deviceService; - - @Transactional(rollbackFor=Exception.class) - @Override - public ResponseData addBatchAndDevices(List batches, Task task) { - //提交前先验证是否已经存在,若存在且批次号或每批数量改变先删除 - try { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("task_id", task.getTaskId()); - List batchList = this.selectList(entityWrapper); - Map batchMap= new HashMap<>(); - Map batchMap1= new HashMap<>(); - List batchIdlist = new ArrayList<>(); - for (Batch batch : batches) { - batchMap.put(batch.getBatchNumber(),batch.getBatchCount()); - batch.setTaskId(task.getTaskId()); - batch.setDevtypeId(task.getDevtypeId()); - batchIdlist.add(batch.getId()); - } - for (Batch batch : batchList) { - batchMap1.put(batch.getBatchNumber(),batch.getBatchCount()); - } - - //若批次号和数量不变只更新批次表 - if (DeviceUtil.equalMap(batchMap, batchMap1)) { - this.insertOrUpdateBatch(batches); - } - //若批次号和数量更新，更新设备表（删除批次相关的设备后，写入新的设备） - else { - - //验证设备数量是否合格 - ProductDeviceType deviceType = deviceTypeService.selectDeviceTypeByModel(task.getDevmodeId()); - Map resultMap = DeviceUtil.validate(deviceType, batches, task); - if (!Boolean.valueOf(resultMap.get("success").toString())) { - return ResponseData.error(400, resultMap.get("msg").toString()); - } - //删除批次 - EntityWrapper batchEntityWrapper = new EntityWrapper<>(); - batchEntityWrapper.eq("task_id", task.getTaskId()); - this.delete(batchEntityWrapper); - //删除设备 - EntityWrapper deviceEntityWrapper = new EntityWrapper<>(); - deviceEntityWrapper.in("batch_id", batchIdlist); - deviceEntityWrapper.eq("devtype_id",task.getDevtypeId()); - deviceService.delete(deviceEntityWrapper); - - //写入批次 - this.insertBatch(batches); - //写入设备 - List deviceList = DeviceUtil.createDevCodes(deviceType, batches); - deviceService.insertBatch(deviceList); - } - } catch (Exception e) { - e.printStackTrace(); - } - return ResponseData.success(); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java deleted file mode 100644 index fac60bb..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.dao.TaskMapper; -import com.casic.missiles.modular.task.service.ITaskService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class TaskServiceImpl extends ServiceImpl implements ITaskService { - -} diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java deleted file mode 100644 index 341d3d1..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 批次控制器 - * - * @author dev - * @Date 2020-03-27 15:29:55 - */ -@Controller -@RequestMapping("/batch") -public class BatchController extends BaseController { - - - @Autowired - private IBatchService batchService; - - - /** - * 获取批次列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return batchService.selectList(null); - } - - /** - * 获取批次分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = batchService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增批次并生成设备 - */ - @RequestMapping(value = "/add") - @ResponseBody - @Transactional - public Object add(@RequestBody List batches, Task task) { - - return batchService.addBatchAndDevices(batches,task); - - } - - /** - * 删除批次 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String batchId) { - batchService.deleteById(batchId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("batchIds") List batchIds) { - batchService.deleteBatchIds(batchIds); - return ResponseData.success(); - } - - /** - * 修改批次 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Batch batch) { - batchService.updateById(batch); - return ResponseData.success(); - } - - - /** - * 根据设备类型id - * 查找批次号 - */ - @RequestMapping(value = "/getBatchNumber") - @ResponseBody - public Object getBatchNumber(Long devtypeId) { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("devtype_id", devtypeId); - entityWrapper.orderBy("id", false); - Batch batch = batchService.selectOne(entityWrapper); - return ResponseData.success(200, "", batch != null ? batch.getBatchNumber() + 1 : 1); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java deleted file mode 100644 index f463168..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.core.util.DateUtil; -import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.ITaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.sql.Timestamp; -import java.util.List; - -/** - * 任务控制器 - * - * @author dev - * @Date 2020-03-27 15:28:26 - */ -@Controller -@RequestMapping("/task") -public class TaskController extends BaseController { - - - @Autowired - private ITaskService taskService; - - - /** - * 获取任务列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return taskService.selectList(null); - } - - /** - * 获取任务分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = taskService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增任务 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.insert(task); - return ResponseData.success(); - } - - /** - * 删除任务 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String taskId) { - taskService.deleteById(taskId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("taskIds") List taskIds) { - taskService.deleteBatchIds(taskIds); - return ResponseData.success(); - } - - /** - * 修改任务 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.updateById(task); - return ResponseData.success(); - } - - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java deleted file mode 100644 index 04c7ef8..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.baomidou.mybatisplus.service.IService; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface IBatchService extends IService { - - /** - * 添加批次和生成设备 - * @param batches - * @param task - * @return - */ - ResponseData addBatchAndDevices(List batches, Task task); -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java deleted file mode 100644 index 50e1d37..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.casic.missiles.modular.system.model.Task; -import com.baomidou.mybatisplus.service.IService; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface ITaskService extends IService { - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java deleted file mode 100644 index a435e46..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.device.service.IDeviceService; -import com.casic.missiles.modular.system.dao.BatchMapper; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.ProductDeviceType; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.service.IProductDeviceTypeService; -import com.casic.missiles.modular.system.util.DeviceUtil; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class BatchServiceImpl extends ServiceImpl implements IBatchService { - - @Autowired - private IProductDeviceTypeService deviceTypeService; - @Autowired - private IDeviceService deviceService; - - @Transactional(rollbackFor=Exception.class) - @Override - public ResponseData addBatchAndDevices(List batches, Task task) { - //提交前先验证是否已经存在,若存在且批次号或每批数量改变先删除 - try { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("task_id", task.getTaskId()); - List batchList = this.selectList(entityWrapper); - Map batchMap= new HashMap<>(); - Map batchMap1= new HashMap<>(); - List batchIdlist = new ArrayList<>(); - for (Batch batch : batches) { - batchMap.put(batch.getBatchNumber(),batch.getBatchCount()); - batch.setTaskId(task.getTaskId()); - batch.setDevtypeId(task.getDevtypeId()); - batchIdlist.add(batch.getId()); - } - for (Batch batch : batchList) { - batchMap1.put(batch.getBatchNumber(),batch.getBatchCount()); - } - - //若批次号和数量不变只更新批次表 - if (DeviceUtil.equalMap(batchMap, batchMap1)) { - this.insertOrUpdateBatch(batches); - } - //若批次号和数量更新，更新设备表（删除批次相关的设备后，写入新的设备） - else { - - //验证设备数量是否合格 - ProductDeviceType deviceType = deviceTypeService.selectDeviceTypeByModel(task.getDevmodeId()); - Map resultMap = DeviceUtil.validate(deviceType, batches, task); - if (!Boolean.valueOf(resultMap.get("success").toString())) { - return ResponseData.error(400, resultMap.get("msg").toString()); - } - //删除批次 - EntityWrapper batchEntityWrapper = new EntityWrapper<>(); - batchEntityWrapper.eq("task_id", task.getTaskId()); - this.delete(batchEntityWrapper); - //删除设备 - EntityWrapper deviceEntityWrapper = new EntityWrapper<>(); - deviceEntityWrapper.in("batch_id", batchIdlist); - deviceEntityWrapper.eq("devtype_id",task.getDevtypeId()); - deviceService.delete(deviceEntityWrapper); - - //写入批次 - this.insertBatch(batches); - //写入设备 - List deviceList = DeviceUtil.createDevCodes(deviceType, batches); - deviceService.insertBatch(deviceList); - } - } catch (Exception e) { - e.printStackTrace(); - } - return ResponseData.success(); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java deleted file mode 100644 index fac60bb..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.dao.TaskMapper; -import com.casic.missiles.modular.task.service.ITaskService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class TaskServiceImpl extends ServiceImpl implements ITaskService { - -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index f9f1c84..0faf332 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -88,6 +88,12 @@ casic-device ${pro.version} + + + com.casic + casic-app + ${app.version} + org.springframework.boot diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java deleted file mode 100644 index 341d3d1..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 批次控制器 - * - * @author dev - * @Date 2020-03-27 15:29:55 - */ -@Controller -@RequestMapping("/batch") -public class BatchController extends BaseController { - - - @Autowired - private IBatchService batchService; - - - /** - * 获取批次列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return batchService.selectList(null); - } - - /** - * 获取批次分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = batchService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增批次并生成设备 - */ - @RequestMapping(value = "/add") - @ResponseBody - @Transactional - public Object add(@RequestBody List batches, Task task) { - - return batchService.addBatchAndDevices(batches,task); - - } - - /** - * 删除批次 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String batchId) { - batchService.deleteById(batchId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("batchIds") List batchIds) { - batchService.deleteBatchIds(batchIds); - return ResponseData.success(); - } - - /** - * 修改批次 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Batch batch) { - batchService.updateById(batch); - return ResponseData.success(); - } - - - /** - * 根据设备类型id - * 查找批次号 - */ - @RequestMapping(value = "/getBatchNumber") - @ResponseBody - public Object getBatchNumber(Long devtypeId) { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("devtype_id", devtypeId); - entityWrapper.orderBy("id", false); - Batch batch = batchService.selectOne(entityWrapper); - return ResponseData.success(200, "", batch != null ? batch.getBatchNumber() + 1 : 1); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java deleted file mode 100644 index f463168..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.core.util.DateUtil; -import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.ITaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.sql.Timestamp; -import java.util.List; - -/** - * 任务控制器 - * - * @author dev - * @Date 2020-03-27 15:28:26 - */ -@Controller -@RequestMapping("/task") -public class TaskController extends BaseController { - - - @Autowired - private ITaskService taskService; - - - /** - * 获取任务列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return taskService.selectList(null); - } - - /** - * 获取任务分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = taskService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增任务 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.insert(task); - return ResponseData.success(); - } - - /** - * 删除任务 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String taskId) { - taskService.deleteById(taskId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("taskIds") List taskIds) { - taskService.deleteBatchIds(taskIds); - return ResponseData.success(); - } - - /** - * 修改任务 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.updateById(task); - return ResponseData.success(); - } - - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java deleted file mode 100644 index 04c7ef8..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.baomidou.mybatisplus.service.IService; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface IBatchService extends IService { - - /** - * 添加批次和生成设备 - * @param batches - * @param task - * @return - */ - ResponseData addBatchAndDevices(List batches, Task task); -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java deleted file mode 100644 index 50e1d37..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.casic.missiles.modular.system.model.Task; -import com.baomidou.mybatisplus.service.IService; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface ITaskService extends IService { - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java deleted file mode 100644 index a435e46..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.device.service.IDeviceService; -import com.casic.missiles.modular.system.dao.BatchMapper; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.ProductDeviceType; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.service.IProductDeviceTypeService; -import com.casic.missiles.modular.system.util.DeviceUtil; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class BatchServiceImpl extends ServiceImpl implements IBatchService { - - @Autowired - private IProductDeviceTypeService deviceTypeService; - @Autowired - private IDeviceService deviceService; - - @Transactional(rollbackFor=Exception.class) - @Override - public ResponseData addBatchAndDevices(List batches, Task task) { - //提交前先验证是否已经存在,若存在且批次号或每批数量改变先删除 - try { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("task_id", task.getTaskId()); - List batchList = this.selectList(entityWrapper); - Map batchMap= new HashMap<>(); - Map batchMap1= new HashMap<>(); - List batchIdlist = new ArrayList<>(); - for (Batch batch : batches) { - batchMap.put(batch.getBatchNumber(),batch.getBatchCount()); - batch.setTaskId(task.getTaskId()); - batch.setDevtypeId(task.getDevtypeId()); - batchIdlist.add(batch.getId()); - } - for (Batch batch : batchList) { - batchMap1.put(batch.getBatchNumber(),batch.getBatchCount()); - } - - //若批次号和数量不变只更新批次表 - if (DeviceUtil.equalMap(batchMap, batchMap1)) { - this.insertOrUpdateBatch(batches); - } - //若批次号和数量更新，更新设备表（删除批次相关的设备后，写入新的设备） - else { - - //验证设备数量是否合格 - ProductDeviceType deviceType = deviceTypeService.selectDeviceTypeByModel(task.getDevmodeId()); - Map resultMap = DeviceUtil.validate(deviceType, batches, task); - if (!Boolean.valueOf(resultMap.get("success").toString())) { - return ResponseData.error(400, resultMap.get("msg").toString()); - } - //删除批次 - EntityWrapper batchEntityWrapper = new EntityWrapper<>(); - batchEntityWrapper.eq("task_id", task.getTaskId()); - this.delete(batchEntityWrapper); - //删除设备 - EntityWrapper deviceEntityWrapper = new EntityWrapper<>(); - deviceEntityWrapper.in("batch_id", batchIdlist); - deviceEntityWrapper.eq("devtype_id",task.getDevtypeId()); - deviceService.delete(deviceEntityWrapper); - - //写入批次 - this.insertBatch(batches); - //写入设备 - List deviceList = DeviceUtil.createDevCodes(deviceType, batches); - deviceService.insertBatch(deviceList); - } - } catch (Exception e) { - e.printStackTrace(); - } - return ResponseData.success(); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java deleted file mode 100644 index fac60bb..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.dao.TaskMapper; -import com.casic.missiles.modular.task.service.ITaskService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class TaskServiceImpl extends ServiceImpl implements ITaskService { - -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index f9f1c84..0faf332 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -88,6 +88,12 @@ casic-device ${pro.version} + + + com.casic + casic-app + ${app.version} + org.springframework.boot diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml index 70cc33b..c85523d 100644 --- a/casic-web/src/main/resources/application.yml +++ b/casic-web/src/main/resources/application.yml @@ -15,4 +15,4 @@ casic: kaptcha-open: true #是否开启登录时验证码 (true/false) file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) - nologin-urls: /user/login,/kaptcha,/config/baseConfig \ No newline at end of file + nologin-urls: /user/login,/kaptcha,/config/baseConfig,/appDeviceLog/listPage \ No newline at end of file diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java deleted file mode 100644 index 341d3d1..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 批次控制器 - * - * @author dev - * @Date 2020-03-27 15:29:55 - */ -@Controller -@RequestMapping("/batch") -public class BatchController extends BaseController { - - - @Autowired - private IBatchService batchService; - - - /** - * 获取批次列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return batchService.selectList(null); - } - - /** - * 获取批次分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = batchService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增批次并生成设备 - */ - @RequestMapping(value = "/add") - @ResponseBody - @Transactional - public Object add(@RequestBody List batches, Task task) { - - return batchService.addBatchAndDevices(batches,task); - - } - - /** - * 删除批次 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String batchId) { - batchService.deleteById(batchId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("batchIds") List batchIds) { - batchService.deleteBatchIds(batchIds); - return ResponseData.success(); - } - - /** - * 修改批次 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Batch batch) { - batchService.updateById(batch); - return ResponseData.success(); - } - - - /** - * 根据设备类型id - * 查找批次号 - */ - @RequestMapping(value = "/getBatchNumber") - @ResponseBody - public Object getBatchNumber(Long devtypeId) { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("devtype_id", devtypeId); - entityWrapper.orderBy("id", false); - Batch batch = batchService.selectOne(entityWrapper); - return ResponseData.success(200, "", batch != null ? batch.getBatchNumber() + 1 : 1); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java deleted file mode 100644 index f463168..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.core.util.DateUtil; -import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.ITaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.sql.Timestamp; -import java.util.List; - -/** - * 任务控制器 - * - * @author dev - * @Date 2020-03-27 15:28:26 - */ -@Controller -@RequestMapping("/task") -public class TaskController extends BaseController { - - - @Autowired - private ITaskService taskService; - - - /** - * 获取任务列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return taskService.selectList(null); - } - - /** - * 获取任务分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = taskService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增任务 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.insert(task); - return ResponseData.success(); - } - - /** - * 删除任务 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String taskId) { - taskService.deleteById(taskId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("taskIds") List taskIds) { - taskService.deleteBatchIds(taskIds); - return ResponseData.success(); - } - - /** - * 修改任务 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.updateById(task); - return ResponseData.success(); - } - - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java deleted file mode 100644 index 04c7ef8..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.baomidou.mybatisplus.service.IService; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface IBatchService extends IService { - - /** - * 添加批次和生成设备 - * @param batches - * @param task - * @return - */ - ResponseData addBatchAndDevices(List batches, Task task); -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java deleted file mode 100644 index 50e1d37..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.casic.missiles.modular.system.model.Task; -import com.baomidou.mybatisplus.service.IService; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface ITaskService extends IService { - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java deleted file mode 100644 index a435e46..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.device.service.IDeviceService; -import com.casic.missiles.modular.system.dao.BatchMapper; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.ProductDeviceType; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.service.IProductDeviceTypeService; -import com.casic.missiles.modular.system.util.DeviceUtil; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class BatchServiceImpl extends ServiceImpl implements IBatchService { - - @Autowired - private IProductDeviceTypeService deviceTypeService; - @Autowired - private IDeviceService deviceService; - - @Transactional(rollbackFor=Exception.class) - @Override - public ResponseData addBatchAndDevices(List batches, Task task) { - //提交前先验证是否已经存在,若存在且批次号或每批数量改变先删除 - try { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("task_id", task.getTaskId()); - List batchList = this.selectList(entityWrapper); - Map batchMap= new HashMap<>(); - Map batchMap1= new HashMap<>(); - List batchIdlist = new ArrayList<>(); - for (Batch batch : batches) { - batchMap.put(batch.getBatchNumber(),batch.getBatchCount()); - batch.setTaskId(task.getTaskId()); - batch.setDevtypeId(task.getDevtypeId()); - batchIdlist.add(batch.getId()); - } - for (Batch batch : batchList) { - batchMap1.put(batch.getBatchNumber(),batch.getBatchCount()); - } - - //若批次号和数量不变只更新批次表 - if (DeviceUtil.equalMap(batchMap, batchMap1)) { - this.insertOrUpdateBatch(batches); - } - //若批次号和数量更新，更新设备表（删除批次相关的设备后，写入新的设备） - else { - - //验证设备数量是否合格 - ProductDeviceType deviceType = deviceTypeService.selectDeviceTypeByModel(task.getDevmodeId()); - Map resultMap = DeviceUtil.validate(deviceType, batches, task); - if (!Boolean.valueOf(resultMap.get("success").toString())) { - return ResponseData.error(400, resultMap.get("msg").toString()); - } - //删除批次 - EntityWrapper batchEntityWrapper = new EntityWrapper<>(); - batchEntityWrapper.eq("task_id", task.getTaskId()); - this.delete(batchEntityWrapper); - //删除设备 - EntityWrapper deviceEntityWrapper = new EntityWrapper<>(); - deviceEntityWrapper.in("batch_id", batchIdlist); - deviceEntityWrapper.eq("devtype_id",task.getDevtypeId()); - deviceService.delete(deviceEntityWrapper); - - //写入批次 - this.insertBatch(batches); - //写入设备 - List deviceList = DeviceUtil.createDevCodes(deviceType, batches); - deviceService.insertBatch(deviceList); - } - } catch (Exception e) { - e.printStackTrace(); - } - return ResponseData.success(); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java deleted file mode 100644 index fac60bb..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.dao.TaskMapper; -import com.casic.missiles.modular.task.service.ITaskService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class TaskServiceImpl extends ServiceImpl implements ITaskService { - -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index f9f1c84..0faf332 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -88,6 +88,12 @@ casic-device ${pro.version} + + + com.casic + casic-app + ${app.version} + org.springframework.boot diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml index 70cc33b..c85523d 100644 --- a/casic-web/src/main/resources/application.yml +++ b/casic-web/src/main/resources/application.yml @@ -15,4 +15,4 @@ casic: kaptcha-open: true #是否开启登录时验证码 (true/false) file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) - nologin-urls: /user/login,/kaptcha,/config/baseConfig \ No newline at end of file + nologin-urls: /user/login,/kaptcha,/config/baseConfig,/appDeviceLog/listPage \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 99216e3..1c54b04 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -11,7 +11,7 @@ #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/enterprise2/list,/enterprise2/report,/enterprise3/list,enterprise3/report + nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/appDeviceLog/listPage file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload\ file-download-path: D:\tmp\ producerName: producer diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..9add040 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + com.casic + casic-product-device + 1.0.0-SNAPSHOT + ../pom.xml + + + casic-app + ${pro.version} + jar + casic-app + 批产APP + + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java deleted file mode 100644 index 341d3d1..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 批次控制器 - * - * @author dev - * @Date 2020-03-27 15:29:55 - */ -@Controller -@RequestMapping("/batch") -public class BatchController extends BaseController { - - - @Autowired - private IBatchService batchService; - - - /** - * 获取批次列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return batchService.selectList(null); - } - - /** - * 获取批次分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = batchService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增批次并生成设备 - */ - @RequestMapping(value = "/add") - @ResponseBody - @Transactional - public Object add(@RequestBody List batches, Task task) { - - return batchService.addBatchAndDevices(batches,task); - - } - - /** - * 删除批次 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String batchId) { - batchService.deleteById(batchId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("batchIds") List batchIds) { - batchService.deleteBatchIds(batchIds); - return ResponseData.success(); - } - - /** - * 修改批次 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Batch batch) { - batchService.updateById(batch); - return ResponseData.success(); - } - - - /** - * 根据设备类型id - * 查找批次号 - */ - @RequestMapping(value = "/getBatchNumber") - @ResponseBody - public Object getBatchNumber(Long devtypeId) { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("devtype_id", devtypeId); - entityWrapper.orderBy("id", false); - Batch batch = batchService.selectOne(entityWrapper); - return ResponseData.success(200, "", batch != null ? batch.getBatchNumber() + 1 : 1); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java deleted file mode 100644 index f463168..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.core.util.DateUtil; -import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.ITaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.sql.Timestamp; -import java.util.List; - -/** - * 任务控制器 - * - * @author dev - * @Date 2020-03-27 15:28:26 - */ -@Controller -@RequestMapping("/task") -public class TaskController extends BaseController { - - - @Autowired - private ITaskService taskService; - - - /** - * 获取任务列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return taskService.selectList(null); - } - - /** - * 获取任务分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = taskService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增任务 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.insert(task); - return ResponseData.success(); - } - - /** - * 删除任务 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String taskId) { - taskService.deleteById(taskId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("taskIds") List taskIds) { - taskService.deleteBatchIds(taskIds); - return ResponseData.success(); - } - - /** - * 修改任务 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.updateById(task); - return ResponseData.success(); - } - - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java deleted file mode 100644 index 04c7ef8..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.baomidou.mybatisplus.service.IService; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface IBatchService extends IService { - - /** - * 添加批次和生成设备 - * @param batches - * @param task - * @return - */ - ResponseData addBatchAndDevices(List batches, Task task); -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java deleted file mode 100644 index 50e1d37..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.casic.missiles.modular.system.model.Task; -import com.baomidou.mybatisplus.service.IService; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface ITaskService extends IService { - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java deleted file mode 100644 index a435e46..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.device.service.IDeviceService; -import com.casic.missiles.modular.system.dao.BatchMapper; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.ProductDeviceType; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.service.IProductDeviceTypeService; -import com.casic.missiles.modular.system.util.DeviceUtil; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class BatchServiceImpl extends ServiceImpl implements IBatchService { - - @Autowired - private IProductDeviceTypeService deviceTypeService; - @Autowired - private IDeviceService deviceService; - - @Transactional(rollbackFor=Exception.class) - @Override - public ResponseData addBatchAndDevices(List batches, Task task) { - //提交前先验证是否已经存在,若存在且批次号或每批数量改变先删除 - try { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("task_id", task.getTaskId()); - List batchList = this.selectList(entityWrapper); - Map batchMap= new HashMap<>(); - Map batchMap1= new HashMap<>(); - List batchIdlist = new ArrayList<>(); - for (Batch batch : batches) { - batchMap.put(batch.getBatchNumber(),batch.getBatchCount()); - batch.setTaskId(task.getTaskId()); - batch.setDevtypeId(task.getDevtypeId()); - batchIdlist.add(batch.getId()); - } - for (Batch batch : batchList) { - batchMap1.put(batch.getBatchNumber(),batch.getBatchCount()); - } - - //若批次号和数量不变只更新批次表 - if (DeviceUtil.equalMap(batchMap, batchMap1)) { - this.insertOrUpdateBatch(batches); - } - //若批次号和数量更新，更新设备表（删除批次相关的设备后，写入新的设备） - else { - - //验证设备数量是否合格 - ProductDeviceType deviceType = deviceTypeService.selectDeviceTypeByModel(task.getDevmodeId()); - Map resultMap = DeviceUtil.validate(deviceType, batches, task); - if (!Boolean.valueOf(resultMap.get("success").toString())) { - return ResponseData.error(400, resultMap.get("msg").toString()); - } - //删除批次 - EntityWrapper batchEntityWrapper = new EntityWrapper<>(); - batchEntityWrapper.eq("task_id", task.getTaskId()); - this.delete(batchEntityWrapper); - //删除设备 - EntityWrapper deviceEntityWrapper = new EntityWrapper<>(); - deviceEntityWrapper.in("batch_id", batchIdlist); - deviceEntityWrapper.eq("devtype_id",task.getDevtypeId()); - deviceService.delete(deviceEntityWrapper); - - //写入批次 - this.insertBatch(batches); - //写入设备 - List deviceList = DeviceUtil.createDevCodes(deviceType, batches); - deviceService.insertBatch(deviceList); - } - } catch (Exception e) { - e.printStackTrace(); - } - return ResponseData.success(); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java deleted file mode 100644 index fac60bb..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.dao.TaskMapper; -import com.casic.missiles.modular.task.service.ITaskService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class TaskServiceImpl extends ServiceImpl implements ITaskService { - -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index f9f1c84..0faf332 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -88,6 +88,12 @@ casic-device ${pro.version} + + + com.casic + casic-app + ${app.version} + org.springframework.boot diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml index 70cc33b..c85523d 100644 --- a/casic-web/src/main/resources/application.yml +++ b/casic-web/src/main/resources/application.yml @@ -15,4 +15,4 @@ casic: kaptcha-open: true #是否开启登录时验证码 (true/false) file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) - nologin-urls: /user/login,/kaptcha,/config/baseConfig \ No newline at end of file + nologin-urls: /user/login,/kaptcha,/config/baseConfig,/appDeviceLog/listPage \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 99216e3..1c54b04 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -11,7 +11,7 @@ #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/enterprise2/list,/enterprise2/report,/enterprise3/list,enterprise3/report + nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/appDeviceLog/listPage file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload\ file-download-path: D:\tmp\ producerName: producer diff --git a/casic-web/src/main/resources/ehcache.xml b/casic-web/src/main/resources/ehcache.xml index 78c82d8..6a2c583 100644 --- a/casic-web/src/main/resources/ehcache.xml +++ b/casic-web/src/main/resources/ehcache.xml @@ -53,6 +53,19 @@ memoryStoreEvictionPolicy="LFU" transactionalMode="off"> + + + + com.casic + casic-core + ${casic.version} + + + com.casic + casic-admin-support + ${casic.version} + + + com.casic + casic-export-support + 1.0.0-SNAPSHOT + + + + com.casic + casic-admin-support + ${casic.version} + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-test + test + + + commons-io + commons-io + + + + org.apache.commons + commons-lang3 + + + + + + + src/main/java + + **/*.xml + + + + + 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 new file mode 100644 index 0000000..ebff04e --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,44 @@ +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 new file mode 100644 index 0000000..8514576 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -0,0 +1,102 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:20:31 + */ +@Controller +@RequestMapping("/appDeviceAdd") +public class AppDeviceAddController extends BaseController { + + + @Resource + private IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceAddService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceAddService.selectPage(page, query); + return super.packForBT(page); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceAdd appDeviceAdd) { + //新增时验证设备编号是否已经存在 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceAdd.getDevcode()); + if (CollectionUtils.isNotEmpty(appDeviceAddList)) { + return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加"); + } + appDeviceAddService.insert(appDeviceAdd); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceAddId) { + appDeviceAddService.deleteById(appDeviceAddId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceAddIds") List appDeviceAddIds) { + appDeviceAddService.deleteBatchIds(appDeviceAddIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceAdd appDeviceAdd) { + appDeviceAddService.updateById(appDeviceAdd); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java new file mode 100644 index 0000000..a7733d8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java @@ -0,0 +1,105 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:38 + */ +@Controller +@RequestMapping("/appDeviceLog") +public class AppDeviceLogController extends BaseController { + + + @Resource + private IAppDeviceLogService appDeviceLogService; + + @Resource + IAppDeviceAddService appDeviceAddService; + + + /** + * 获取施工添加设备列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return appDeviceLogService.selectList(null); + } + + /** + * 获取施工添加设备分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = appDeviceLogService.selectPage(page, query); + return new SuccessResponseData(super.packForBT(page)); + } + + /** + * 新增施工添加设备 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(AppDeviceLog appDeviceLog) { + appDeviceLogService.insert(appDeviceLog); + //添加运维日志的同时更新施工日志 + List appDeviceAddList = + appDeviceAddService.getAppDevice(appDeviceLog.getDevcode()); + appDeviceAddService.updateBatchById(appDeviceAddList); + return ResponseData.success(); + } + + /** + * 删除施工添加设备 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String appDeviceLogId) { + appDeviceLogService.deleteById(appDeviceLogId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("appDeviceLogIds") List appDeviceLogIds) { + appDeviceLogService.deleteBatchIds(appDeviceLogIds); + return ResponseData.success(); + } + + /** + * 修改施工添加设备 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(AppDeviceLog appDeviceLog) { + appDeviceLogService.updateById(appDeviceLog); + 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 new file mode 100644 index 0000000..86a76f7 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -0,0 +1,94 @@ +package com.casic.missiles.modular.app.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 施工添加设备控制器 + * + * @author dev + * @Date 2020-05-24 11:21:45 + */ +@Controller +@RequestMapping("/appUserOpenid") +public class AppUserOpenidController extends BaseController { + + + @Resource + private IAppUserOpenidService appUserOpenidService; + + + /** + * 获取施工添加设备列表 + */ + @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) { + 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") + @ResponseBody + public Object update(AppUserOpenid appUserOpenid) { + appUserOpenidService.updateById(appUserOpenid); + return ResponseData.success(); + } + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java new file mode 100644 index 0000000..4b9be7a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceAddMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java new file mode 100644 index 0000000..4a0131a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppDeviceLogMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java new file mode 100644 index 0000000..33d0660 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserOpenidMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface AppUserOpenidMapper extends BaseMapper { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml new file mode 100644 index 0000000..07ead85 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml new file mode 100644 index 0000000..6e5b436 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml new file mode 100644 index 0000000..7ca27b9 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserOpenidMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + ID AS id, openid, USER_ID AS userId, telephone, attr + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java new file mode 100644 index 0000000..61862b2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_add") +public class AppDeviceAdd extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /**ap + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceAdd{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java new file mode 100644 index 0000000..1be81fb --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java @@ -0,0 +1,272 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_device_log") +public class AppDeviceLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 设备编号 + */ + private String devcode; + /** + * 井编号 + */ + private String wellcode; + /** + * 井类型 + */ + private String welltype; + /** + * 井深 + */ + private String welldepth; + /** + * 到井口距离 + */ + private String installheigt; + /** + * 安装人员 + */ + private String installperson; + /** + * 安装时间 + */ + private Date installtime; + /** + * 照片路径 + */ + private String photopath; + /** + * 权属单位 + */ + private String factory; + /** + * 所属项目 + */ + private String project; + /** + * 施工信息 + */ + private String workmsg; + /** + * 位置描述 + */ + private String position; + /** + * 备注 + */ + private String description; + /** + * 创建时间 + */ + private Date createtime; + /** + * 经度 + */ + private String longitude; + /** + * 维度 + */ + private String latitude; + /** + * 设备类型 + */ + private String devicetype; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellcode() { + return wellcode; + } + + public void setWellcode(String wellcode) { + this.wellcode = wellcode; + } + + public String getWelltype() { + return welltype; + } + + public void setWelltype(String welltype) { + this.welltype = welltype; + } + + public String getWelldepth() { + return welldepth; + } + + public void setWelldepth(String welldepth) { + this.welldepth = welldepth; + } + + public String getInstallheigt() { + return installheigt; + } + + public void setInstallheigt(String installheigt) { + this.installheigt = installheigt; + } + + public String getInstallperson() { + return installperson; + } + + public void setInstallperson(String installperson) { + this.installperson = installperson; + } + + public Date getInstalltime() { + return installtime; + } + + public void setInstalltime(Date installtime) { + this.installtime = installtime; + } + + public String getPhotopath() { + return photopath; + } + + public void setPhotopath(String photopath) { + this.photopath = photopath; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getWorkmsg() { + return workmsg; + } + + public void setWorkmsg(String workmsg) { + this.workmsg = workmsg; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getDevicetype() { + return devicetype; + } + + public void setDevicetype(String devicetype) { + this.devicetype = devicetype; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppDeviceLog{" + + "id=" + id + + ", devcode=" + devcode + + ", wellcode=" + wellcode + + ", welltype=" + welltype + + ", welldepth=" + welldepth + + ", installheigt=" + installheigt + + ", installperson=" + installperson + + ", installtime=" + installtime + + ", photopath=" + photopath + + ", factory=" + factory + + ", project=" + project + + ", workmsg=" + workmsg + + ", position=" + position + + ", description=" + description + + ", createtime=" + createtime + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", devicetype=" + devicetype + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java new file mode 100644 index 0000000..d2013a2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUserOpenid.java @@ -0,0 +1,97 @@ +package com.casic.missiles.modular.app.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@TableName("app_user_openid") +public class AppUserOpenid extends Model { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private Long id; + /** + * 微信小程序登录识别id + */ + private String openid; + @TableField("USER_ID") + private Long userId; + /** + * 手机号 + */ + private String telephone; + /** + * 备注 + */ + private String attr; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAttr() { + return attr; + } + + public void setAttr(String attr) { + this.attr = attr; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "AppUserOpenid{" + + "id=" + id + + ", openid=" + openid + + ", userId=" + userId + + ", telephone=" + telephone + + ", attr=" + attr + + "}"; + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java new file mode 100644 index 0000000..d1aaf2a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceAdd; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceAddService extends IService { + + List getAppDevice(String devcode); +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java new file mode 100644 index 0000000..c5d7e5a --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppDeviceLog; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppDeviceLogService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java new file mode 100644 index 0000000..2f180c1 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserOpenidService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.app.model.AppUserOpenid; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +public interface IAppUserOpenidService extends IService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java new file mode 100644 index 0000000..e6a43b4 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceAddMapper; +import com.casic.missiles.modular.app.model.AppDeviceAdd; +import com.casic.missiles.modular.app.service.IAppDeviceAddService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService { + + @Override + public List getAppDevice(String devcode) { + + EntityWrapper ew = new EntityWrapper<>(); + ew.eq("devcode", devcode); + return selectList(ew); + + } +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java new file mode 100644 index 0000000..50d83e8 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppDeviceLogMapper; +import com.casic.missiles.modular.app.model.AppDeviceLog; +import com.casic.missiles.modular.app.service.IAppDeviceLogService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService { + +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java new file mode 100644 index 0000000..02c4fb2 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserOpenidServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.app.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.app.dao.AppUserOpenidMapper; +import com.casic.missiles.modular.app.model.AppUserOpenid; +import com.casic.missiles.modular.app.service.IAppUserOpenidService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2020-05-24 + */ +@Service +public class AppUserOpenidServiceImpl extends ServiceImpl implements IAppUserOpenidService { + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java deleted file mode 100644 index 341d3d1..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/BatchController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 批次控制器 - * - * @author dev - * @Date 2020-03-27 15:29:55 - */ -@Controller -@RequestMapping("/batch") -public class BatchController extends BaseController { - - - @Autowired - private IBatchService batchService; - - - /** - * 获取批次列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return batchService.selectList(null); - } - - /** - * 获取批次分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = batchService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增批次并生成设备 - */ - @RequestMapping(value = "/add") - @ResponseBody - @Transactional - public Object add(@RequestBody List batches, Task task) { - - return batchService.addBatchAndDevices(batches,task); - - } - - /** - * 删除批次 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String batchId) { - batchService.deleteById(batchId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("batchIds") List batchIds) { - batchService.deleteBatchIds(batchIds); - return ResponseData.success(); - } - - /** - * 修改批次 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Batch batch) { - batchService.updateById(batch); - return ResponseData.success(); - } - - - /** - * 根据设备类型id - * 查找批次号 - */ - @RequestMapping(value = "/getBatchNumber") - @ResponseBody - public Object getBatchNumber(Long devtypeId) { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("devtype_id", devtypeId); - entityWrapper.orderBy("id", false); - Batch batch = batchService.selectOne(entityWrapper); - return ResponseData.success(200, "", batch != null ? batch.getBatchNumber() + 1 : 1); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java b/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java deleted file mode 100644 index f463168..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/controller/TaskController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.casic.missiles.modular.task.controller; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.core.util.DateUtil; -import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.task.service.ITaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.sql.Timestamp; -import java.util.List; - -/** - * 任务控制器 - * - * @author dev - * @Date 2020-03-27 15:28:26 - */ -@Controller -@RequestMapping("/task") -public class TaskController extends BaseController { - - - @Autowired - private ITaskService taskService; - - - /** - * 获取任务列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return taskService.selectList(null); - } - - /** - * 获取任务分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = new PageFactory().defaultPage(); - EntityWrapper query = new EntityWrapper<>(); - page = taskService.selectPage(page, query); - return super.packForBT(page); - } - - /** - * 新增任务 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.insert(task); - return ResponseData.success(); - } - - /** - * 删除任务 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String taskId) { - taskService.deleteById(taskId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("taskIds") List taskIds) { - taskService.deleteBatchIds(taskIds); - return ResponseData.success(); - } - - /** - * 修改任务 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(Task task, String deliveryTimeFmt) { - task.setDeliveryTime(ToolUtil.isNotEmpty(deliveryTimeFmt) ? - DateUtil.parse(deliveryTimeFmt, "yyyy-MM-dd") : null); - taskService.updateById(task); - return ResponseData.success(); - } - - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java deleted file mode 100644 index 04c7ef8..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/IBatchService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.baomidou.mybatisplus.service.IService; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Task; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface IBatchService extends IService { - - /** - * 添加批次和生成设备 - * @param batches - * @param task - * @return - */ - ResponseData addBatchAndDevices(List batches, Task task); -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java deleted file mode 100644 index 50e1d37..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/ITaskService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.modular.task.service; - -import com.casic.missiles.modular.system.model.Task; -import com.baomidou.mybatisplus.service.IService; - -/** - *

- * 服务类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -public interface ITaskService extends IService { - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java deleted file mode 100644 index a435e46..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/BatchServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.modular.device.service.IDeviceService; -import com.casic.missiles.modular.system.dao.BatchMapper; -import com.casic.missiles.modular.system.model.Batch; -import com.casic.missiles.modular.system.model.Device; -import com.casic.missiles.modular.system.model.ProductDeviceType; -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.service.IProductDeviceTypeService; -import com.casic.missiles.modular.system.util.DeviceUtil; -import com.casic.missiles.modular.task.service.IBatchService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class BatchServiceImpl extends ServiceImpl implements IBatchService { - - @Autowired - private IProductDeviceTypeService deviceTypeService; - @Autowired - private IDeviceService deviceService; - - @Transactional(rollbackFor=Exception.class) - @Override - public ResponseData addBatchAndDevices(List batches, Task task) { - //提交前先验证是否已经存在,若存在且批次号或每批数量改变先删除 - try { - EntityWrapper entityWrapper = new EntityWrapper<>(); - entityWrapper.eq("task_id", task.getTaskId()); - List batchList = this.selectList(entityWrapper); - Map batchMap= new HashMap<>(); - Map batchMap1= new HashMap<>(); - List batchIdlist = new ArrayList<>(); - for (Batch batch : batches) { - batchMap.put(batch.getBatchNumber(),batch.getBatchCount()); - batch.setTaskId(task.getTaskId()); - batch.setDevtypeId(task.getDevtypeId()); - batchIdlist.add(batch.getId()); - } - for (Batch batch : batchList) { - batchMap1.put(batch.getBatchNumber(),batch.getBatchCount()); - } - - //若批次号和数量不变只更新批次表 - if (DeviceUtil.equalMap(batchMap, batchMap1)) { - this.insertOrUpdateBatch(batches); - } - //若批次号和数量更新，更新设备表（删除批次相关的设备后，写入新的设备） - else { - - //验证设备数量是否合格 - ProductDeviceType deviceType = deviceTypeService.selectDeviceTypeByModel(task.getDevmodeId()); - Map resultMap = DeviceUtil.validate(deviceType, batches, task); - if (!Boolean.valueOf(resultMap.get("success").toString())) { - return ResponseData.error(400, resultMap.get("msg").toString()); - } - //删除批次 - EntityWrapper batchEntityWrapper = new EntityWrapper<>(); - batchEntityWrapper.eq("task_id", task.getTaskId()); - this.delete(batchEntityWrapper); - //删除设备 - EntityWrapper deviceEntityWrapper = new EntityWrapper<>(); - deviceEntityWrapper.in("batch_id", batchIdlist); - deviceEntityWrapper.eq("devtype_id",task.getDevtypeId()); - deviceService.delete(deviceEntityWrapper); - - //写入批次 - this.insertBatch(batches); - //写入设备 - List deviceList = DeviceUtil.createDevCodes(deviceType, batches); - deviceService.insertBatch(deviceList); - } - } catch (Exception e) { - e.printStackTrace(); - } - return ResponseData.success(); - } - -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java deleted file mode 100644 index fac60bb..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/task/service/impl/TaskServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.task.service.impl; - -import com.casic.missiles.modular.system.model.Task; -import com.casic.missiles.modular.system.dao.TaskMapper; -import com.casic.missiles.modular.task.service.ITaskService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author stylefeng123 - * @since 2020-03-27 - */ -@Service -public class TaskServiceImpl extends ServiceImpl implements ITaskService { - -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index f9f1c84..0faf332 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -88,6 +88,12 @@ casic-device ${pro.version} + + + com.casic + casic-app + ${app.version} + org.springframework.boot diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml index 70cc33b..c85523d 100644 --- a/casic-web/src/main/resources/application.yml +++ b/casic-web/src/main/resources/application.yml @@ -15,4 +15,4 @@ casic: kaptcha-open: true #是否开启登录时验证码 (true/false) file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) - nologin-urls: /user/login,/kaptcha,/config/baseConfig \ No newline at end of file + nologin-urls: /user/login,/kaptcha,/config/baseConfig,/appDeviceLog/listPage \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 99216e3..1c54b04 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -11,7 +11,7 @@ #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/enterprise2/list,/enterprise2/report,/enterprise3/list,enterprise3/report + nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/appDeviceLog/listPage file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload\ file-download-path: D:\tmp\ producerName: producer diff --git a/casic-web/src/main/resources/ehcache.xml b/casic-web/src/main/resources/ehcache.xml index 78c82d8..6a2c583 100644 --- a/casic-web/src/main/resources/ehcache.xml +++ b/casic-web/src/main/resources/ehcache.xml @@ -53,6 +53,19 @@ memoryStoreEvictionPolicy="LFU" transactionalMode="off"> + +