diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/OpLogManager.java b/sec-api/src/main/java/com/imdroid/secapi/dto/OpLogManager.java index 974392e5..c254d052 100644 --- a/sec-api/src/main/java/com/imdroid/secapi/dto/OpLogManager.java +++ b/sec-api/src/main/java/com/imdroid/secapi/dto/OpLogManager.java @@ -19,7 +19,8 @@ public class OpLogManager { public final static Short OP_OBJ_GROUP = 6; public final static Short OP_OBJ_WARNING = 7; public final static Short OP_OBJ_SYS = 8; - public final static Short OP_OBJ_DEVICE_MSG = 9; + public final static Short OP_OBJ_FWD_RECORD = 9; + @Autowired OpLogMapper opLogMapper; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssResendController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssResendController.java index 253566d4..ed8ab7f5 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssResendController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssResendController.java @@ -2,18 +2,16 @@ package com.imdroid.beidou.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.imdroid.beidou.common.HttpResult; import com.imdroid.beidou.service.CommonExcelService; -import com.imdroid.secapi.dto.GnssGroupFwd; -import com.imdroid.secapi.dto.GnssGroupFwdMapper; -import com.imdroid.secapi.dto.ResendRecord; -import com.imdroid.secapi.dto.ResendRecordMapper; +import com.imdroid.secapi.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpSession; +import java.time.LocalDateTime; import java.util.List; @Controller @@ -22,6 +20,10 @@ public class GnssResendController extends BasicController implements CommonExcel GnssGroupFwdMapper gnssGroupFwdMapper; @Autowired ResendRecordMapper resendRecordMapper; + @Autowired + TenantMapper tenantMapper; + @Autowired + OpLogManager opLogManager; /********* 推送页面 *********/ @RequestMapping("/page/resend_records") @@ -33,6 +35,19 @@ public class GnssResendController extends BasicController implements CommonExcel return "/page/resend_records"; } + @RequestMapping("/page/table/resend_record_add") + public String gnssAddDev(Model m, HttpSession session) { + initModel(m, session); + //以下用于下拉框数据 + List tenants = tenantMapper.selectList(null); + List gnssGroupFwds = gnssGroupFwdMapper.selectList(null); + + m.addAttribute("tenant_list", tenants); + m.addAttribute("gnss_group_fwd_list", gnssGroupFwds); + m.addAttribute("device", new GnssDevice()); + + return "/page/table/resend_record_add"; + } /********* 推送数据 *********/ @RequestMapping("/fwd/resend_records") @@ -41,6 +56,40 @@ public class GnssResendController extends BasicController implements CommonExcel return this.pageList(session, page, limit, searchParams); } + @PostMapping("/fwd/resend_records/add") + @ResponseBody + public String update(HttpSession session, @RequestBody JSONObject object) throws Exception { + // 从请求参数中创建对象 + ResendRecord resendRecord = JSONObject.toJavaObject(object,ResendRecord.class); + resendRecord.setCreatetime(LocalDateTime.now()); + resendRecord.setState(ResendRecord.STATE_BREAK_POINT); + int num = resendRecordMapper.insert(resendRecord); + if (num == 0) { + return HttpResult.failed(); + } else { + opLogManager.addLog(getLoginUser(session),getTenantId(session), + OpLogManager.OP_TYPE_ADD, + OpLogManager.OP_OBJ_FWD_RECORD, + "create new resend record"); + return HttpResult.ok(); + } + } + + @PostMapping("/fwd/resend_records/delete") + @ResponseBody + public String delete(HttpSession session, @RequestParam String del_id) throws Exception { + int num = resendRecordMapper.deleteById(del_id); + opLogManager.addLog(getLoginUser(session),getTenantId(session), + OpLogManager.OP_TYPE_DEL, + OpLogManager.OP_OBJ_FWD_RECORD, + del_id + " deleted"); + if (num == 0) { + return HttpResult.failed(); + } else{ + return HttpResult.ok(); + } + } + /** * 获取实体类的class * diff --git a/sec-beidou/src/main/resources/templates/page/resend_records.html b/sec-beidou/src/main/resources/templates/page/resend_records.html index 014bd506..a660d0cb 100644 --- a/sec-beidou/src/main/resources/templates/page/resend_records.html +++ b/sec-beidou/src/main/resources/templates/page/resend_records.html @@ -53,16 +53,38 @@
+ + - diff --git a/sec-beidou/src/main/resources/templates/page/table/resend_record_add.html b/sec-beidou/src/main/resources/templates/page/table/resend_record_add.html new file mode 100644 index 00000000..c4232083 --- /dev/null +++ b/sec-beidou/src/main/resources/templates/page/table/resend_record_add.html @@ -0,0 +1,136 @@ + + + + + 补传数据 + + + + + + + + + +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + + + + + \ No newline at end of file