From 3d28cc569ff9bdf20ac56598ae4de8e2809d6f35 Mon Sep 17 00:00:00 2001
From: admin <liwen611>
Date: 星期二, 09 四月 2024 18:23:42 +0800
Subject: [PATCH] 电力代码去除
---
/dev/null | 420 ----------------------------------------------
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java | 29 ---
ruoyi-admin/src/main/java/com/ruoyi/DataTransmissionThread.java | 6
ruoyi-admin/src/main/resources/application-druid.yml | 12 -
ruoyi-admin/src/main/java/com/ruoyi/aibrain/controller/AiCameraController.java | 18 -
ruoyi-admin/src/main/java/com/ruoyi/task/AiBrainTask.java | 14 -
ruoyi-admin/src/main/java/com/ruoyi/task/SjcsDlTask.java | 5
ruoyi-admin/src/main/resources/application-two.yml | 14 -
ruoyi-admin/src/main/resources/application-one.yml | 14 -
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-ui/src/views/newIndex.vue | 1
ruoyi-admin/src/main/java/com/ruoyi/camera/controller/CameraShipingsbController.java | 1
12 files changed, 8 insertions(+), 528 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/DataTransmissionThread.java b/ruoyi-admin/src/main/java/com/ruoyi/DataTransmissionThread.java
index 2440946..040ae4e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/DataTransmissionThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/DataTransmissionThread.java
@@ -5,7 +5,6 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.task.CameraAssembleUtil;
-import com.ruoyi.task.DataAssembleUtil;
import com.ruoyi.utils.FtpUtils;
import java.text.SimpleDateFormat;
@@ -28,7 +27,6 @@
@Override
public void run() {
- FtpUtils ftpUtil = new FtpUtils(RuoYiConfig.getFtpHost(),RuoYiConfig.getFtpUserName(),RuoYiConfig.getFtpPassWord());
while (true){
Date date=new Date();
String nowTime=format.format(date);
@@ -46,9 +44,7 @@
//鑾峰彇闃熷垪涓殑绗竴涓�(闃叉鍙戦�侀绻侊紝涓�娆″彧澶勭悊涓�涓�)
JSONObject obj= (JSONObject) redisCache.lGetLpopIndex(Thread.currentThread().getName());
- if(Thread.currentThread().getName().equals("DataAssemble")){
- DataAssembleUtil.DataTransmission(ftpUtil,obj);
- }else if(Thread.currentThread().getName().equals("CameraAssemble")){
+ if(Thread.currentThread().getName().equals("CameraAssemble")){
CameraAssembleUtil.DataTransmission(obj);
}
}else{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index 2cbae45..5a5a49a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -1,15 +1,8 @@
package com.ruoyi;
-import com.ruoyi.task.DataAssembleUtil;
-import com.ruoyi.utils.CameraUtils;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
-import org.springframework.jms.config.JmsListenerContainerFactory;
-
-import javax.jms.ConnectionFactory;
/**
* 鍚姩绋嬪簭
@@ -17,34 +10,14 @@
* @author ruoyi
*/
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class RuoYiApplication
-{
+public class RuoYiApplication {
public static void main(String[] args){
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(鈾モ棤鈥库棤)锞夛緸 AI鏅鸿兘瑙嗛鐩戞帶绯荤粺鍚姩鎴愬姛 醿�(麓凇`醿�)锞� \n");
- DataAssembleUtil.AssembleBDZSBJBXX();//璁惧淇℃伅
- DataAssembleUtil.AssembleBDZSBJCSJ();//娴嬬偣淇℃伅
-
//鍚姩1涓嚎绋嬭繘琛屾暟鎹彂閫佸鐞�
- new DataTransmissionThread("DataAssemble").start();
new DataTransmissionThread("CameraAssemble").start();
-
- CameraUtils.startCamera();
-
-
-
- }
-
- //闇�瑕佺粰topic瀹氫箟鐙珛鐨凧msListenerContainer
- //鍙戝竷-璁㈤槄妯″紡鐨凩istenerContainer
- @Bean
- public JmsListenerContainerFactory<?> jmsListenerContainerTopic(ConnectionFactory activeMQConnectionFactory) {
- DefaultJmsListenerContainerFactory bean = new DefaultJmsListenerContainerFactory();
- bean.setPubSubDomain(true);
- bean.setConnectionFactory(activeMQConnectionFactory);
- return bean;
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/activeMQ/CustomerRest.java b/ruoyi-admin/src/main/java/com/ruoyi/activeMQ/CustomerRest.java
deleted file mode 100644
index 0fab179..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/activeMQ/CustomerRest.java
+++ /dev/null
@@ -1,404 +0,0 @@
-package com.ruoyi.activeMQ;
-
-/**
- * 娑堟伅鐨勬秷璐硅��
- * @author Administrator
- */
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.aibrain.domain.AiAlarmInfo;
-import com.ruoyi.aibrain.domain.AiCamera;
-import com.ruoyi.aibrain.service.IAiAlarmInfoService;
-import com.ruoyi.aibrain.service.IAiCameraService;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.framework.web.service.UserDetailsServiceImpl;
-import com.ruoyi.framework.websocket.WebSocketServer;
-import com.ruoyi.framework.websocket.WebSocketUsers;
-import com.ruoyi.system.domain.AiRule;
-import com.ruoyi.system.service.IAiRuleService;
-import com.ruoyi.utils.Base64Util;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jms.annotation.JmsListener;
-import org.springframework.stereotype.Service;
-
-import javax.websocket.EncodeException;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-
-/**
- * Created by beyondLi
- * Date 2017/12/21
- * Desc 鐢熶骇鑰卹est .
- */
-@Service
-public class CustomerRest {
-
- private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);
-
- @Autowired
- private IAiCameraService aiCameraService;
-
- @Autowired
- private IAiRuleService aiRuleService;
-
- @Autowired
- private IAiAlarmInfoService aiAlarmInfoService;
-
- public static SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS");
-
-
- /**
- * 鐩戝惉 - 鎽勫儚澶存帶鍒剁粨鏋滈槦鍒�
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
-// @JmsListener(destination = "VideoRealTopic1921683036",containerFactory="jmsListenerContainerTopic")
-// public void VideoRealTopic(String info) {
-//
-// log.info("CameraResultTopic鎺ユ敹鍒扮殑json瀛楃涓瞷}",info);
-// }
-
-
- /**
- * 鐩戝惉 - 鎽勫儚澶存帶鍒剁粨鏋滈槦鍒�
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- @JmsListener(destination = "CameraResultTopic",containerFactory="jmsListenerContainerTopic")
- public void cameraControlResultTopic(String info) {
- log.info("CameraResultTopic鎺ユ敹鍒扮殑json瀛楃涓瞷}",info);
- JSONObject json = JSON.parseObject(info);
- long id = Long.parseLong(json.getString("cameraId"));//鎽勫儚澶碔D
- String success = json.getString("success");//鏄惁鎴愬姛 1杩炴帴涓� 2鎴愬姛 3澶辫触 4杩炴帴涓柇
-
- AiCamera camera = aiCameraService.selectAiCameraById(id);
- JSONObject result = new JSONObject();
- if(success.equals("1")){
- result.put("nowMessage",camera.getRegionName()+"AI璇嗗埆璁惧"+camera.getName()+"杩炴帴鎴愬姛銆�");
- camera.setStatus("1");//鍦ㄧ嚎
- }else if(success.equals("2")){
- result.put("nowMessage",camera.getRegionName()+"AI璇嗗埆璁惧"+camera.getName()+"杩炴帴澶辫触銆�");
- camera.setStatus("0");//绂荤嚎
- }else if(success.equals("3")){
- result.put("nowMessage",camera.getRegionName()+"AI璇嗗埆璁惧"+camera.getName()+"杩炴帴涓柇銆�");
- camera.setStatus("0");//绂荤嚎
- }
- camera.setUpdateBy("cameraControlResultTopic");
- aiCameraService.updateAiCameraStatus(camera);
-// WebSocketUsers.sendMessageToUsersByText(result.toJSONString());
- }
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- @JmsListener(destination = "AlarmResultTopic",containerFactory="jmsListenerContainerTopic")
- public void alarmInfoTopic(String info) {
- log.info("AlarmResultTopic鎺ユ敹鍒扮殑json瀛楃涓瞷}",info);
- JSONObject json = JSON.parseObject(info);
- long cameraId = Long.parseLong(json.getString("cameraId"));//鎽勫儚澶碔D
- long ruleId = Long.parseLong(json.getString("ruleId"));//绠楁硶ID
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- String path = json.getString("path");//鎶ヨ鎶撴媿鐗囨璺緞
- String newPath = path.substring(0, path.lastIndexOf("."))+"N.mp4";
-
- Date time = new Date(json.getLong("time"));//褰撳墠鏃堕棿鎴�
-
- AiCamera camera = aiCameraService.selectAiCameraById(cameraId);
- AiRule rule = aiRuleService.selectAiRuleById(ruleId);
- toCompressFile(path,newPath);
- String picture = Base64Util.base64ToJpg(pictureBase64, camera.getCameraNum());
- String video = newPath.replaceAll(RuoYiConfig.getProfile(), Constants.RESOURCE_PREFIX);
-
- AiAlarmInfo alarm = new AiAlarmInfo();
- alarm.setCameraId(cameraId);
- alarm.setRegion(camera.getRegion());
- alarm.setRuleId(ruleId);
- alarm.setContent(rule.getContent());
- alarm.setSmallClass(rule.getRuleType());
- alarm.setAlarmTime(time);
- //10鍒嗛挓鍐呯浉鍚岀殑鎶ヨ涓嶅啀鏂板
- AiAlarmInfo aiAlarmInfo = aiAlarmInfoService.selectAlarmInfo(alarm);
- if(aiAlarmInfo==null){
- alarm.setVideo(video);
- alarm.setPicture(picture);
- aiAlarmInfoService.insertAiAlarmInfo(alarm);
- }else{
- Date alarmTime = aiAlarmInfo.getAlarmTime();
- if((time.getTime()-alarmTime.getTime())>600000){
- //闂撮殧瓒呰繃10鍒嗛挓
- alarm.setVideo(video);
- alarm.setPicture(picture);
- aiAlarmInfoService.insertAiAlarmInfo(alarm);
- }
- }
- }
-
- /*
- * 瑙嗛杞爜
- * @param convertFile 寰呰浆鎹㈢殑鏂囦欢
- * @param targetFile 杞崲鍚庣殑鐩爣鏂囦欢
- */
- private static void toCompressFile(String convertFile,String targetFile){
- try{
- Runtime runtime = Runtime.getRuntime();
- runtime.exec("ffmpeg -version");
- //ffmpeg -i C:\mpeg4record\2022-10-15\192.168.1.64_01_0_20221015_120508_1.mp4 -vcodec libx264 E:\test\test.mp4
- String cutCmd="ffmpeg -i " + convertFile + " -vcodec libx264 "+ targetFile;
- System.out.println("cutCmd:"+cutCmd);
- runtime.exec(cutCmd);
- System.out.println("鏂囦欢锛�"+convertFile+" 姝ｅ湪杞崲涓�傘�傘��");
- }catch(Exception e){
- e.printStackTrace();
- System.out.println("鍘嬬缉鏂囦欢鍑虹幇寮傚父锛�"+e.getMessage());
- }
- }
- public static void main(String[] args) {
-
- toCompressFile("","");
-
- }
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683036",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683036(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683036{}");
- //WebSocketServer.sendPicMessage(pictureBase64, "1921683036");
-
- writeLogInFile(sdf.format(new Date())+"======="+pictureBase64);
-
- }*/
-
- public static void writeLogInFile(String content){
- File file = new File("/home/aiModel.txt");
- if(!file.exists()){
- try {
- file.createNewFile();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- Writer writer = null;
- StringBuilder outputString = new StringBuilder();
- try {
- outputString.append(content+"\r\n");
- writer = new FileWriter(file,true);
- writer.write(outputString.toString());
- } catch (IOException e) {
- e.printStackTrace();
- }finally {
- try {
- writer.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683041",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683041(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683041寮�濮媨}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683041");
- log.info("VideoRealTopic1921683041缁撴潫{}");
- }*/
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683042",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683042(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683042{}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683042");
- }*/
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683043",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683043(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683043{}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683043");
- }*/
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683044",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683044(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683044{}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683044");
- }*/
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683045",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683045(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683045{}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683045");
- }*/
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683046",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683046(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683046{}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683046");
- }*/
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683047",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683047(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683047{}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683047");
- }*/
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683048",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683048(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683048{}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683048");
- }*/
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683049",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683049(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683049{}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683049");
- }*/
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683050",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683050(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683050{}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683050");
- }*/
-
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683051",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683051(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683051{}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683051");
- }
-*/
- /**
- * 鐩戝惉 - 鎶ヨ淇℃伅闃熷垪
- * destination锛氱洃鍚殑闃熷垪鍚嶇О
- * containerFactory:鐩戝惉妯″紡
- * jmsListenerContainerFactory P2P妯″紡
- * jmsListenerContainerTopic 璁㈤槄妯″紡
- */
- /*@JmsListener(destination = "VideoRealTopic1921683052",containerFactory="jmsListenerContainerTopic")
- public void VideoRealTopic1921683052(String info) throws EncodeException, IOException {
- JSONObject json = JSON.parseObject(info);
- String pictureBase64 = json.getString("pictureBase64");//鎶ヨ鐜板満鍥剧墖
- log.info("VideoRealTopic1921683052{}");
- WebSocketServer.sendPicMessage(pictureBase64, "1921683052");
- }*/
-
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aibrain/controller/AiCameraController.java b/ruoyi-admin/src/main/java/com/ruoyi/aibrain/controller/AiCameraController.java
index b31903a..c8a11db 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aibrain/controller/AiCameraController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aibrain/controller/AiCameraController.java
@@ -1,11 +1,9 @@
package com.ruoyi.aibrain.controller;
import java.util.List;
-import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.HIKVISION.GetPicFromIPV;
-import com.ruoyi.utils.CameraUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -112,13 +110,7 @@
*/
@PostMapping("startCamera")
public AjaxResult startCamera(AiCamera aiCamera) {
- CameraUtils.startCamera(aiCamera.getId(),"2");
- try {
- TimeUnit.SECONDS.sleep(2);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- CameraUtils.startCamera(aiCamera.getId(),"1");
+
return AjaxResult.success();
}
@@ -127,13 +119,7 @@
*/
@PostMapping("startCameraAll")
public AjaxResult startCameraAll() {
- CameraUtils.startCameraAll("2");
- try {
- TimeUnit.SECONDS.sleep(5);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- CameraUtils.startCameraAll("1");
+
return AjaxResult.success();
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/camera/controller/CameraShipingsbController.java b/ruoyi-admin/src/main/java/com/ruoyi/camera/controller/CameraShipingsbController.java
index 3938293..7680488 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/camera/controller/CameraShipingsbController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/camera/controller/CameraShipingsbController.java
@@ -11,7 +11,6 @@
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.task.CameraAssembleUtil;
-import com.ruoyi.task.DataAssembleUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdController.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdController.java
deleted file mode 100644
index a5e9957..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.ruoyi.dl.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.task.DataAssembleUtil;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.dl.domain.DlShebeixxCd;
-import com.ruoyi.dl.service.IDlShebeixxCdService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 璁惧娴嬬偣Controller
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-@RestController
-@RequestMapping("/dl/cd")
-public class DlShebeixxCdController extends BaseController
-{
- @Autowired
- private IDlShebeixxCdService dlShebeixxCdService;
-
- /**
- * 鏌ヨ璁惧娴嬬偣鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('dl:cd:list')")
- @GetMapping("/list")
- public TableDataInfo list(DlShebeixxCd dlShebeixxCd)
- {
- startPage();
- List<DlShebeixxCd> list = dlShebeixxCdService.selectDlShebeixxCdList(dlShebeixxCd);
- return getDataTable(list);
- }
-
- /**
- * 鍙戦�佹祴鐐硅缁嗕俊鎭�
- */
- @PreAuthorize("@ss.hasPermi('dl:cd:query')")
- @GetMapping(value = "/faSong")
- public AjaxResult faSong(){
- DataAssembleUtil.AssembleBDZSBJCSJ();//娴嬬偣淇℃伅
- return success();
- }
-
- /**
- * 瀵煎嚭璁惧娴嬬偣鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('dl:cd:export')")
- @Log(title = "璁惧娴嬬偣", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, DlShebeixxCd dlShebeixxCd)
- {
- List<DlShebeixxCd> list = dlShebeixxCdService.selectDlShebeixxCdList(dlShebeixxCd);
- ExcelUtil<DlShebeixxCd> util = new ExcelUtil<DlShebeixxCd>(DlShebeixxCd.class);
- util.exportExcel(response, list, "璁惧娴嬬偣鏁版嵁");
- }
-
- /**
- * 鑾峰彇璁惧娴嬬偣璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('dl:cd:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(dlShebeixxCdService.selectDlShebeixxCdById(id));
- }
-
- /**
- * 鏂板璁惧娴嬬偣
- */
- @PreAuthorize("@ss.hasPermi('dl:cd:add')")
- @Log(title = "璁惧娴嬬偣", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody DlShebeixxCd dlShebeixxCd)
- {
- return toAjax(dlShebeixxCdService.insertDlShebeixxCd(dlShebeixxCd));
- }
-
- /**
- * 淇敼璁惧娴嬬偣
- */
- @PreAuthorize("@ss.hasPermi('dl:cd:edit')")
- @Log(title = "璁惧娴嬬偣", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody DlShebeixxCd dlShebeixxCd)
- {
- return toAjax(dlShebeixxCdService.updateDlShebeixxCd(dlShebeixxCd));
- }
-
- /**
- * 鍒犻櫎璁惧娴嬬偣
- */
- @PreAuthorize("@ss.hasPermi('dl:cd:remove')")
- @Log(title = "璁惧娴嬬偣", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(dlShebeixxCdService.deleteDlShebeixxCdByIds(ids));
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdSssjController.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdSssjController.java
deleted file mode 100644
index 9941ccc..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdSssjController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.ruoyi.dl.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.dl.domain.DlShebeixxCdSssj;
-import com.ruoyi.dl.service.IDlShebeixxCdSssjService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 璁惧娴嬬偣瀹炴椂鏁版嵁Controller
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-@RestController
-@RequestMapping("/dl/sssj")
-public class DlShebeixxCdSssjController extends BaseController
-{
- @Autowired
- private IDlShebeixxCdSssjService dlShebeixxCdSssjService;
-
- /**
- * 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('dl:sssj:list')")
- @GetMapping("/list")
- public TableDataInfo list(DlShebeixxCdSssj dlShebeixxCdSssj)
- {
- startPage();
- List<DlShebeixxCdSssj> list = dlShebeixxCdSssjService.selectDlShebeixxCdSssjList(dlShebeixxCdSssj);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭璁惧娴嬬偣瀹炴椂鏁版嵁鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('dl:sssj:export')")
- @Log(title = "璁惧娴嬬偣瀹炴椂鏁版嵁", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, DlShebeixxCdSssj dlShebeixxCdSssj)
- {
- List<DlShebeixxCdSssj> list = dlShebeixxCdSssjService.selectDlShebeixxCdSssjList(dlShebeixxCdSssj);
- ExcelUtil<DlShebeixxCdSssj> util = new ExcelUtil<DlShebeixxCdSssj>(DlShebeixxCdSssj.class);
- util.exportExcel(response, list, "璁惧娴嬬偣瀹炴椂鏁版嵁鏁版嵁");
- }
-
- /**
- * 鑾峰彇璁惧娴嬬偣瀹炴椂鏁版嵁璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('dl:sssj:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(dlShebeixxCdSssjService.selectDlShebeixxCdSssjById(id));
- }
-
- /**
- * 鏂板璁惧娴嬬偣瀹炴椂鏁版嵁
- */
- @PreAuthorize("@ss.hasPermi('dl:sssj:add')")
- @Log(title = "璁惧娴嬬偣瀹炴椂鏁版嵁", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody DlShebeixxCdSssj dlShebeixxCdSssj)
- {
- return toAjax(dlShebeixxCdSssjService.insertDlShebeixxCdSssj(dlShebeixxCdSssj));
- }
-
- /**
- * 淇敼璁惧娴嬬偣瀹炴椂鏁版嵁
- */
- @PreAuthorize("@ss.hasPermi('dl:sssj:edit')")
- @Log(title = "璁惧娴嬬偣瀹炴椂鏁版嵁", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody DlShebeixxCdSssj dlShebeixxCdSssj)
- {
- return toAjax(dlShebeixxCdSssjService.updateDlShebeixxCdSssj(dlShebeixxCdSssj));
- }
-
- /**
- * 鍒犻櫎璁惧娴嬬偣瀹炴椂鏁版嵁
- */
- @PreAuthorize("@ss.hasPermi('dl:sssj:remove')")
- @Log(title = "璁惧娴嬬偣瀹炴椂鏁版嵁", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(dlShebeixxCdSssjService.deleteDlShebeixxCdSssjByIds(ids));
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdYcsjController.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdYcsjController.java
deleted file mode 100644
index 106747e..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdYcsjController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.ruoyi.dl.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.dl.domain.DlShebeixxCdYcsj;
-import com.ruoyi.dl.service.IDlShebeixxCdYcsjService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 璁惧娴嬬偣寮傚父鏁版嵁Controller
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-@RestController
-@RequestMapping("/dl/ycsj")
-public class DlShebeixxCdYcsjController extends BaseController
-{
- @Autowired
- private IDlShebeixxCdYcsjService dlShebeixxCdYcsjService;
-
- /**
- * 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('dl:ycsj:list')")
- @GetMapping("/list")
- public TableDataInfo list(DlShebeixxCdYcsj dlShebeixxCdYcsj)
- {
- startPage();
- List<DlShebeixxCdYcsj> list = dlShebeixxCdYcsjService.selectDlShebeixxCdYcsjList(dlShebeixxCdYcsj);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭璁惧娴嬬偣寮傚父鏁版嵁鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('dl:ycsj:export')")
- @Log(title = "璁惧娴嬬偣寮傚父鏁版嵁", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, DlShebeixxCdYcsj dlShebeixxCdYcsj)
- {
- List<DlShebeixxCdYcsj> list = dlShebeixxCdYcsjService.selectDlShebeixxCdYcsjList(dlShebeixxCdYcsj);
- ExcelUtil<DlShebeixxCdYcsj> util = new ExcelUtil<DlShebeixxCdYcsj>(DlShebeixxCdYcsj.class);
- util.exportExcel(response, list, "璁惧娴嬬偣寮傚父鏁版嵁鏁版嵁");
- }
-
- /**
- * 鑾峰彇璁惧娴嬬偣寮傚父鏁版嵁璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('dl:ycsj:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(dlShebeixxCdYcsjService.selectDlShebeixxCdYcsjById(id));
- }
-
- /**
- * 鏂板璁惧娴嬬偣寮傚父鏁版嵁
- */
- @PreAuthorize("@ss.hasPermi('dl:ycsj:add')")
- @Log(title = "璁惧娴嬬偣寮傚父鏁版嵁", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody DlShebeixxCdYcsj dlShebeixxCdYcsj)
- {
- return toAjax(dlShebeixxCdYcsjService.insertDlShebeixxCdYcsj(dlShebeixxCdYcsj));
- }
-
- /**
- * 淇敼璁惧娴嬬偣寮傚父鏁版嵁
- */
- @PreAuthorize("@ss.hasPermi('dl:ycsj:edit')")
- @Log(title = "璁惧娴嬬偣寮傚父鏁版嵁", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody DlShebeixxCdYcsj dlShebeixxCdYcsj)
- {
- return toAjax(dlShebeixxCdYcsjService.updateDlShebeixxCdYcsj(dlShebeixxCdYcsj));
- }
-
- /**
- * 鍒犻櫎璁惧娴嬬偣寮傚父鏁版嵁
- */
- @PreAuthorize("@ss.hasPermi('dl:ycsj:remove')")
- @Log(title = "璁惧娴嬬偣寮傚父鏁版嵁", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(dlShebeixxCdYcsjService.deleteDlShebeixxCdYcsjByIds(ids));
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxController.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxController.java
deleted file mode 100644
index c7d3adb..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxController.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.ruoyi.dl.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.task.DataAssembleUtil;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.dl.domain.DlShebeixx;
-import com.ruoyi.dl.service.IDlShebeixxService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 璁惧淇℃伅Controller
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-@RestController
-@RequestMapping("/dl/shebeixx")
-public class DlShebeixxController extends BaseController
-{
- @Autowired
- private IDlShebeixxService dlShebeixxService;
-
- /**
- * 鏌ヨ璁惧淇℃伅鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('dl:shebeixx:list')")
- @GetMapping("/list")
- public TableDataInfo list(DlShebeixx dlShebeixx)
- {
- startPage();
- List<DlShebeixx> list = dlShebeixxService.selectDlShebeixxList(dlShebeixx);
- return getDataTable(list);
- }
-
-
- /**
- * 鍙戦�佽澶囦俊鎭缁嗕俊鎭�
- */
- @PreAuthorize("@ss.hasPermi('dl:shebeixx:query')")
- @GetMapping(value = "/faSong")
- public AjaxResult faSong(){
- DataAssembleUtil.AssembleBDZSBJBXX();//璁惧淇℃伅
- return success();
- }
-
- /**
- * 瀵煎嚭璁惧淇℃伅鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('dl:shebeixx:export')")
- @Log(title = "璁惧淇℃伅", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, DlShebeixx dlShebeixx)
- {
- List<DlShebeixx> list = dlShebeixxService.selectDlShebeixxList(dlShebeixx);
- ExcelUtil<DlShebeixx> util = new ExcelUtil<DlShebeixx>(DlShebeixx.class);
- util.exportExcel(response, list, "璁惧淇℃伅鏁版嵁");
- }
-
- /**
- * 鑾峰彇璁惧淇℃伅璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('dl:shebeixx:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(dlShebeixxService.selectDlShebeixxById(id));
- }
-
- /**
- * 鏂板璁惧淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('dl:shebeixx:add')")
- @Log(title = "璁惧淇℃伅", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody DlShebeixx dlShebeixx)
- {
- return toAjax(dlShebeixxService.insertDlShebeixx(dlShebeixx));
- }
-
- /**
- * 淇敼璁惧淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('dl:shebeixx:edit')")
- @Log(title = "璁惧淇℃伅", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody DlShebeixx dlShebeixx)
- {
- return toAjax(dlShebeixxService.updateDlShebeixx(dlShebeixx));
- }
-
- /**
- * 鍒犻櫎璁惧淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('dl:shebeixx:remove')")
- @Log(title = "璁惧淇℃伅", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(dlShebeixxService.deleteDlShebeixxByIds(ids));
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixx.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixx.java
deleted file mode 100644
index 0e5436c..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixx.java
+++ /dev/null
@@ -1,306 +0,0 @@
-package com.ruoyi.dl.domain;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 璁惧淇℃伅瀵硅薄 dl_shebeixx
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public class DlShebeixx extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 涓婚敭 */
- private Long id;
-
- /** 鐭跨璁惧绫诲瀷 */
- @Excel(name = "鐭跨璁惧绫诲瀷")
- private Long kuangDuanSBLX;
-
- /** 鐭跨璁惧绫诲瀷鍚嶇О */
- @Excel(name = "鐭跨璁惧绫诲瀷鍚嶇О")
- private String kuangDuanSBLXMC;
-
-
-
- /** 璁惧缂栫爜 */
- @Excel(name = "璁惧缂栫爜")
- private String sheBeiBM;
-
- /** 璁惧鍚嶇О */
- @Excel(name = "璁惧鍚嶇О")
- private String sheBeiMC;
-
- /** 瑙勬牸鍨嬪彿 */
- @Excel(name = "瑙勬牸鍨嬪彿")
- private String guiGeXH;
-
- /** 璁惧绫诲埆 */
- @Excel(name = "璁惧绫诲埆")
- private Long sheBeiLX;
-
- /** 鐢熶骇鏃ユ湡 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鐢熶骇鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- private Date shengChanRQ;
-
- /** 鎵�灞炵郴缁� */
- @Excel(name = "鎵�灞炵郴缁�")
- private String suoShuXT;
-
- /** 瀹夎鏃ユ湡 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "瀹夎鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- private Date anZhuangRQ;
-
- /** 瀹夎浣嶇疆 */
- @Excel(name = "瀹夎浣嶇疆")
- private String anZhuangWZ;
-
- /** 鐢熶骇鍘傚 */
- @Excel(name = "鐢熶骇鍘傚")
- private String shengChanCJ;
-
- /** 鍑哄巶缂栫爜 */
- @Excel(name = "鍑哄巶缂栫爜")
- private String chuChangBM;
-
- /** 瀹夋爣璇佷功缂栧彿 */
- @Excel(name = "瀹夋爣璇佷功缂栧彿")
- private String anBIaoZSBH;
-
- /** 闃茬垎璇佷功缂栧彿 */
- @Excel(name = "闃茬垎璇佷功缂栧彿")
- private String fangBaoZSBH;
-
- /** 棰濆畾鐢靛帇 */
- @Excel(name = "棰濆畾鐢靛帇")
- private BigDecimal eDingDY;
-
- /** 棰濆畾鐢垫祦 */
- @Excel(name = "棰濆畾鐢垫祦")
- private BigDecimal eDingDL;
-
- /** 棰濆畾鍔熺巼 */
- @Excel(name = "棰濆畾鍔熺巼")
- private BigDecimal eDingGL;
-
- /** 绯荤粺缂栫爜 */
- @Excel(name = "绯荤粺缂栫爜")
- private String xiTongBM;
-
- public String getXiTongBM() {
- return xiTongBM;
- }
-
- public void setXiTongBM(String xiTongBM) {
- this.xiTongBM = xiTongBM;
- }
-
- /** 鏂囦欢鍒嗙被 */
- @Excel(name = "鏂囦欢鍒嗙被")
- private String wenJianFL;
-
- public String getWenJianFL() {
- return wenJianFL;
- }
-
- public void setWenJianFL(String wenJianFL) {
- this.wenJianFL = wenJianFL;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setKuangDuanSBLX(Long kuangDuanSBLX)
- {
- this.kuangDuanSBLX = kuangDuanSBLX;
- }
-
- public Long getKuangDuanSBLX()
- {
- return kuangDuanSBLX;
- }
- public void setKuangDuanSBLXMC(String kuangDuanSBLXMC)
- {
- this.kuangDuanSBLXMC = kuangDuanSBLXMC;
- }
-
- public String getKuangDuanSBLXMC()
- {
- return kuangDuanSBLXMC;
- }
- public void setSheBeiBM(String sheBeiBM)
- {
- this.sheBeiBM = sheBeiBM;
- }
-
- public String getSheBeiBM()
- {
- return sheBeiBM;
- }
- public void setSheBeiMC(String sheBeiMC)
- {
- this.sheBeiMC = sheBeiMC;
- }
-
- public String getSheBeiMC()
- {
- return sheBeiMC;
- }
- public void setGuiGeXH(String guiGeXH)
- {
- this.guiGeXH = guiGeXH;
- }
-
- public String getGuiGeXH()
- {
- return guiGeXH;
- }
- public void setSheBeiLX(Long sheBeiLX)
- {
- this.sheBeiLX = sheBeiLX;
- }
-
- public Long getSheBeiLX()
- {
- return sheBeiLX;
- }
- public void setShengChanRQ(Date shengChanRQ)
- {
- this.shengChanRQ = shengChanRQ;
- }
-
- public Date getShengChanRQ()
- {
- return shengChanRQ;
- }
- public void setSuoShuXT(String suoShuXT)
- {
- this.suoShuXT = suoShuXT;
- }
-
- public String getSuoShuXT()
- {
- return suoShuXT;
- }
- public void setAnZhuangRQ(Date anZhuangRQ)
- {
- this.anZhuangRQ = anZhuangRQ;
- }
-
- public Date getAnZhuangRQ()
- {
- return anZhuangRQ;
- }
- public void setAnZhuangWZ(String anZhuangWZ)
- {
- this.anZhuangWZ = anZhuangWZ;
- }
-
- public String getAnZhuangWZ()
- {
- return anZhuangWZ;
- }
- public void setShengChanCJ(String shengChanCJ)
- {
- this.shengChanCJ = shengChanCJ;
- }
-
- public String getShengChanCJ()
- {
- return shengChanCJ;
- }
- public void setChuChangBM(String chuChangBM)
- {
- this.chuChangBM = chuChangBM;
- }
-
- public String getChuChangBM()
- {
- return chuChangBM;
- }
- public void setAnBIaoZSBH(String anBIaoZSBH)
- {
- this.anBIaoZSBH = anBIaoZSBH;
- }
-
- public String getAnBIaoZSBH()
- {
- return anBIaoZSBH;
- }
- public void setFangBaoZSBH(String fangBaoZSBH)
- {
- this.fangBaoZSBH = fangBaoZSBH;
- }
-
- public String getFangBaoZSBH()
- {
- return fangBaoZSBH;
- }
- public void seteDingDY(BigDecimal eDingDY)
- {
- this.eDingDY = eDingDY;
- }
-
- public BigDecimal geteDingDY()
- {
- return eDingDY;
- }
- public void seteDingDL(BigDecimal eDingDL)
- {
- this.eDingDL = eDingDL;
- }
-
- public BigDecimal geteDingDL()
- {
- return eDingDL;
- }
- public void seteDingGL(BigDecimal eDingGL)
- {
- this.eDingGL = eDingGL;
- }
-
- public BigDecimal geteDingGL()
- {
- return eDingGL;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("kuangDuanSBLX", getKuangDuanSBLX())
- .append("kuangDuanSBLXMC", getKuangDuanSBLXMC())
- .append("sheBeiBM", getSheBeiBM())
- .append("sheBeiMC", getSheBeiMC())
- .append("guiGeXH", getGuiGeXH())
- .append("sheBeiLX", getSheBeiLX())
- .append("shengChanRQ", getShengChanRQ())
- .append("suoShuXT", getSuoShuXT())
- .append("anZhuangRQ", getAnZhuangRQ())
- .append("anZhuangWZ", getAnZhuangWZ())
- .append("shengChanCJ", getShengChanCJ())
- .append("chuChangBM", getChuChangBM())
- .append("anBIaoZSBH", getAnBIaoZSBH())
- .append("fangBaoZSBH", getFangBaoZSBH())
- .append("eDingDY", geteDingDY())
- .append("eDingDL", geteDingDL())
- .append("eDingGL", geteDingGL())
- .toString();
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCd.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCd.java
deleted file mode 100644
index 941d5e3..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCd.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package com.ruoyi.dl.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 璁惧娴嬬偣瀵硅薄 dl_shebeixx_cd
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public class DlShebeixxCd extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 涓婚敭 */
- private Long id;
-
- /** 娴嬬偣缂栫爜 */
- @Excel(name = "娴嬬偣缂栫爜")
- private String ceDianBM;
-
- /** 娴嬬偣绫诲瀷缂栫爜 */
- @Excel(name = "娴嬬偣绫诲瀷缂栫爜")
- private String ceDianLXBM;
-
- /** 娴嬬偣绫诲瀷鍚嶇О */
- @Excel(name = "娴嬬偣绫诲瀷鍚嶇О")
- private String ceDianLXMC;
-
- /** 鎵�灞炶澶囩紪鐮� */
- @Excel(name = "鎵�灞炶澶囩紪鐮�")
- private String suoShuSBBM;
-
- /** 娴嬬偣浣嶇疆 */
- @Excel(name = "娴嬬偣浣嶇疆")
- private String ceDianWZ;
-
- /** 娴嬮噺鍊煎崟浣� */
- @Excel(name = "娴嬮噺鍊煎崟浣�")
- private String ceLiangZDW;
-
- /** 閲忕▼涓婇檺 */
- @Excel(name = "閲忕▼涓婇檺")
- private String liangChenSX;
-
- /** 閲忕▼涓嬮檺 */
- @Excel(name = "閲忕▼涓嬮檺")
- private String liangChenXX;
-
- /** 鎶ヨ涓婇檺 */
- @Excel(name = "鎶ヨ涓婇檺")
- private String biaoJingSX;
-
- /** 鎶ヨ涓嬮檺 */
- @Excel(name = "鎶ヨ涓嬮檺")
- private String biaoJingXX;
-
- /** 浼犳劅鍣ㄥ叧鑱斿叧绯� */
- @Excel(name = "浼犳劅鍣ㄥ叧鑱斿叧绯�")
- private String chuanGanQGLGX;
-
- /** 鏁版嵁瀹氫箟鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鏁版嵁瀹氫箟鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date shuJuDYSJ;
-
- /** 绯荤粺缂栫爜 */
- @Excel(name = "绯荤粺缂栫爜")
- private String xiTongBM;
-
- public String getXiTongBM() {
- return xiTongBM;
- }
-
- public void setXiTongBM(String xiTongBM) {
- this.xiTongBM = xiTongBM;
- }
-
- /** 鏂囦欢鍒嗙被 */
- @Excel(name = "鏂囦欢鍒嗙被")
- private String wenJianFL;
-
- public String getWenJianFL() {
- return wenJianFL;
- }
-
- public void setWenJianFL(String wenJianFL) {
- this.wenJianFL = wenJianFL;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setCeDianBM(String ceDianBM)
- {
- this.ceDianBM = ceDianBM;
- }
-
- public String getCeDianBM()
- {
- return ceDianBM;
- }
- public void setCeDianLXBM(String ceDianLXBM)
- {
- this.ceDianLXBM = ceDianLXBM;
- }
-
- public String getCeDianLXBM()
- {
- return ceDianLXBM;
- }
- public void setCeDianLXMC(String ceDianLXMC)
- {
- this.ceDianLXMC = ceDianLXMC;
- }
-
- public String getCeDianLXMC()
- {
- return ceDianLXMC;
- }
- public void setSuoShuSBBM(String suoShuSBBM)
- {
- this.suoShuSBBM = suoShuSBBM;
- }
-
- public String getSuoShuSBBM()
- {
- return suoShuSBBM;
- }
- public void setCeDianWZ(String ceDianWZ)
- {
- this.ceDianWZ = ceDianWZ;
- }
-
- public String getCeDianWZ()
- {
- return ceDianWZ;
- }
- public void setCeLiangZDW(String ceLiangZDW)
- {
- this.ceLiangZDW = ceLiangZDW;
- }
-
- public String getCeLiangZDW()
- {
- return ceLiangZDW;
- }
- public void setLiangChenSX(String liangChenSX)
- {
- this.liangChenSX = liangChenSX;
- }
-
- public String getLiangChenSX()
- {
- return liangChenSX;
- }
- public void setLiangChenXX(String liangChenXX)
- {
- this.liangChenXX = liangChenXX;
- }
-
- public String getLiangChenXX()
- {
- return liangChenXX;
- }
- public void setBiaoJingSX(String biaoJingSX)
- {
- this.biaoJingSX = biaoJingSX;
- }
-
- public String getBiaoJingSX()
- {
- return biaoJingSX;
- }
- public void setBiaoJingXX(String biaoJingXX)
- {
- this.biaoJingXX = biaoJingXX;
- }
-
- public String getBiaoJingXX()
- {
- return biaoJingXX;
- }
- public void setChuanGanQGLGX(String chuanGanQGLGX)
- {
- this.chuanGanQGLGX = chuanGanQGLGX;
- }
-
- public String getChuanGanQGLGX()
- {
- return chuanGanQGLGX;
- }
- public void setShuJuDYSJ(Date shuJuDYSJ)
- {
- this.shuJuDYSJ = shuJuDYSJ;
- }
-
- public Date getShuJuDYSJ()
- {
- return shuJuDYSJ;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("ceDianBM", getCeDianBM())
- .append("ceDianLXBM", getCeDianLXBM())
- .append("ceDianLXMC", getCeDianLXMC())
- .append("suoShuSBBM", getSuoShuSBBM())
- .append("ceDianWZ", getCeDianWZ())
- .append("ceLiangZDW", getCeLiangZDW())
- .append("liangChenSX", getLiangChenSX())
- .append("liangChenXX", getLiangChenXX())
- .append("biaoJingSX", getBiaoJingSX())
- .append("biaoJingXX", getBiaoJingXX())
- .append("chuanGanQGLGX", getChuanGanQGLGX())
- .append("shuJuDYSJ", getShuJuDYSJ())
- .toString();
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCdSssj.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCdSssj.java
deleted file mode 100644
index 9279af2..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCdSssj.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.ruoyi.dl.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 璁惧娴嬬偣瀹炴椂鏁版嵁瀵硅薄 dl_shebeixx_cd_sssj
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public class DlShebeixxCdSssj extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 涓婚敭 */
- private Long id;
-
- /** 娴嬬偣缂栫爜 */
- @Excel(name = "娴嬬偣缂栫爜")
- private String ceDianBM;
-
- /** 娴嬬偣绫诲瀷缂栫爜 */
- @Excel(name = "娴嬬偣绫诲瀷缂栫爜")
- private String ceDianLXBM;
-
- /** 娴嬬偣绫诲瀷鍚嶇О */
- @Excel(name = "娴嬬偣绫诲瀷鍚嶇О")
- private String ceDianLXMC;
-
- /** 鎵�灞炶澶囩紪鐮� */
- @Excel(name = "鎵�灞炶澶囩紪鐮�")
- private String suoShuSBBM;
-
- /** 娴嬬偣鏁板�� */
- @Excel(name = "娴嬬偣鏁板��")
- private String ceDianSZ;
-
- /** 娴嬬偣鏁板�煎崟浣� */
- @Excel(name = "娴嬬偣鏁板�煎崟浣�")
- private String ceDianSZDW;
-
- /** 娴嬬偣鐘舵�� */
- @Excel(name = "娴嬬偣鐘舵��")
- private String ceDianZT;
-
- /** 鏁版嵁鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鏁版嵁鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date shuJuSJ;
-
- /** 绯荤粺缂栫爜 */
- @Excel(name = "绯荤粺缂栫爜")
- private String xiTongBM;
-
- public String getXiTongBM() {
- return xiTongBM;
- }
-
- public void setXiTongBM(String xiTongBM) {
- this.xiTongBM = xiTongBM;
- }
-
- /** 鏂囦欢鍒嗙被 */
- @Excel(name = "鏂囦欢鍒嗙被")
- private String wenJianFL;
-
- public String getWenJianFL() {
- return wenJianFL;
- }
-
- public void setWenJianFL(String wenJianFL) {
- this.wenJianFL = wenJianFL;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setCeDianBM(String ceDianBM)
- {
- this.ceDianBM = ceDianBM;
- }
-
- public String getCeDianBM()
- {
- return ceDianBM;
- }
- public void setCeDianLXBM(String ceDianLXBM)
- {
- this.ceDianLXBM = ceDianLXBM;
- }
-
- public String getCeDianLXBM()
- {
- return ceDianLXBM;
- }
- public void setCeDianLXMC(String ceDianLXMC)
- {
- this.ceDianLXMC = ceDianLXMC;
- }
-
- public String getCeDianLXMC()
- {
- return ceDianLXMC;
- }
- public void setSuoShuSBBM(String suoShuSBBM)
- {
- this.suoShuSBBM = suoShuSBBM;
- }
-
- public String getSuoShuSBBM()
- {
- return suoShuSBBM;
- }
- public void setCeDianSZ(String ceDianSZ)
- {
- this.ceDianSZ = ceDianSZ;
- }
-
- public String getCeDianSZ()
- {
- return ceDianSZ;
- }
- public void setCeDianSZDW(String ceDianSZDW)
- {
- this.ceDianSZDW = ceDianSZDW;
- }
-
- public String getCeDianSZDW()
- {
- return ceDianSZDW;
- }
- public void setCeDianZT(String ceDianZT)
- {
- this.ceDianZT = ceDianZT;
- }
-
- public String getCeDianZT()
- {
- return ceDianZT;
- }
- public void setShuJuSJ(Date shuJuSJ)
- {
- this.shuJuSJ = shuJuSJ;
- }
-
- public Date getShuJuSJ()
- {
- return shuJuSJ;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("ceDianBM", getCeDianBM())
- .append("ceDianLXBM", getCeDianLXBM())
- .append("ceDianLXMC", getCeDianLXMC())
- .append("suoShuSBBM", getSuoShuSBBM())
- .append("ceDianSZ", getCeDianSZ())
- .append("ceDianSZDW", getCeDianSZDW())
- .append("ceDianZT", getCeDianZT())
- .append("shuJuSJ", getShuJuSJ())
- .toString();
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCdYcsj.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCdYcsj.java
deleted file mode 100644
index 513fc3c..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCdYcsj.java
+++ /dev/null
@@ -1,292 +0,0 @@
-package com.ruoyi.dl.domain;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 璁惧娴嬬偣寮傚父鏁版嵁瀵硅薄 dl_shebeixx_cd_ycsj
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public class DlShebeixxCdYcsj extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 涓婚敭 */
- private Long id;
-
- /** 娴嬬偣缂栫爜 */
- @Excel(name = "娴嬬偣缂栫爜")
- private String ceDianBM;
-
- /** 娴嬬偣绫诲瀷缂栫爜 */
- @Excel(name = "娴嬬偣绫诲瀷缂栫爜")
- private String ceDianLXBM;
-
- /** 娴嬬偣绫诲瀷鍚嶇О */
- @Excel(name = "娴嬬偣绫诲瀷鍚嶇О")
- private String ceDianLXMC;
-
- /** 鎵�灞炶澶囩紪鐮� */
- @Excel(name = "鎵�灞炶澶囩紪鐮�")
- private String suoShuSBBM;
-
- /** 寮傚父绫诲瀷 */
- @Excel(name = "寮傚父绫诲瀷")
- private String yiChangLX;
-
- /** 寮傚父寮�濮嬫椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "寮傚父寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date yiChangKSSJ;
-
- /** 寮傚父缁撴潫鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "寮傚父缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date yiChangJSSJ;
-
- /** 寮傚父鏈熼棿鏈�澶у�� */
- @Excel(name = "寮傚父鏈熼棿鏈�澶у��")
- private String yiChangQJZDZ;
-
- /** 鏈�澶у�兼椂鍒� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鏈�澶у�兼椂鍒�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date zuiDaZSK;
-
- /** 寮傚父鏈熼棿鏈�灏忓�� */
- @Excel(name = "寮傚父鏈熼棿鏈�灏忓��")
- private String yiChangQJZXZ;
-
- /** 鏈�灏忓�兼椂鍒� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鏈�灏忓�兼椂鍒�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date zuiXiaoZSK;
-
- /** 寮傚父鏈熼棿骞冲潎鍊� */
- @Excel(name = "寮傚父鏈熼棿骞冲潎鍊�")
- private String yiChangQJPJZ;
-
- /** 鏁版嵁鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鏁版嵁鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date shuJuSJ;
-
- /** 寮傚父鏁版嵁涔嬪拰 */
- @Excel(name = "寮傚父鏁版嵁涔嬪拰")
- private BigDecimal yiChangSJZH;
-
- /** 寮傚父鏁版嵁鏁伴噺 */
- @Excel(name = "寮傚父鏁版嵁鏁伴噺")
- private BigDecimal yiChangSJSL;
-
- /** 鏄惁鍙戦�� 0鏈彂閫� 1鍙戦�� */
- @Excel(name = "鏄惁鍙戦�� 0鏈彂閫� 1鍙戦��")
- private Integer shiFouFS;
-
- /** 绯荤粺缂栫爜 */
- @Excel(name = "绯荤粺缂栫爜")
- private String xiTongBM;
-
- public String getXiTongBM() {
- return xiTongBM;
- }
-
- public void setXiTongBM(String xiTongBM) {
- this.xiTongBM = xiTongBM;
- }
-
- /** 鏂囦欢鍒嗙被 */
- @Excel(name = "鏂囦欢鍒嗙被")
- private String wenJianFL;
-
- public String getWenJianFL() {
- return wenJianFL;
- }
-
- public void setWenJianFL(String wenJianFL) {
- this.wenJianFL = wenJianFL;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setCeDianBM(String ceDianBM)
- {
- this.ceDianBM = ceDianBM;
- }
-
- public String getCeDianBM()
- {
- return ceDianBM;
- }
- public void setCeDianLXBM(String ceDianLXBM)
- {
- this.ceDianLXBM = ceDianLXBM;
- }
-
- public String getCeDianLXBM()
- {
- return ceDianLXBM;
- }
- public void setCeDianLXMC(String ceDianLXMC)
- {
- this.ceDianLXMC = ceDianLXMC;
- }
-
- public String getCeDianLXMC()
- {
- return ceDianLXMC;
- }
- public void setSuoShuSBBM(String suoShuSBBM)
- {
- this.suoShuSBBM = suoShuSBBM;
- }
-
- public String getSuoShuSBBM()
- {
- return suoShuSBBM;
- }
- public void setYiChangLX(String yiChangLX)
- {
- this.yiChangLX = yiChangLX;
- }
-
- public String getYiChangLX()
- {
- return yiChangLX;
- }
- public void setYiChangKSSJ(Date yiChangKSSJ)
- {
- this.yiChangKSSJ = yiChangKSSJ;
- }
-
- public Date getYiChangKSSJ()
- {
- return yiChangKSSJ;
- }
- public void setYiChangJSSJ(Date yiChangJSSJ)
- {
- this.yiChangJSSJ = yiChangJSSJ;
- }
-
- public Date getYiChangJSSJ()
- {
- return yiChangJSSJ;
- }
- public void setYiChangQJZDZ(String yiChangQJZDZ)
- {
- this.yiChangQJZDZ = yiChangQJZDZ;
- }
-
- public String getYiChangQJZDZ()
- {
- return yiChangQJZDZ;
- }
- public void setZuiDaZSK(Date zuiDaZSK)
- {
- this.zuiDaZSK = zuiDaZSK;
- }
-
- public Date getZuiDaZSK()
- {
- return zuiDaZSK;
- }
- public void setYiChangQJZXZ(String yiChangQJZXZ)
- {
- this.yiChangQJZXZ = yiChangQJZXZ;
- }
-
- public String getYiChangQJZXZ()
- {
- return yiChangQJZXZ;
- }
- public void setZuiXiaoZSK(Date zuiXiaoZSK)
- {
- this.zuiXiaoZSK = zuiXiaoZSK;
- }
-
- public Date getZuiXiaoZSK()
- {
- return zuiXiaoZSK;
- }
- public void setYiChangQJPJZ(String yiChangQJPJZ)
- {
- this.yiChangQJPJZ = yiChangQJPJZ;
- }
-
- public String getYiChangQJPJZ()
- {
- return yiChangQJPJZ;
- }
- public void setShuJuSJ(Date shuJuSJ)
- {
- this.shuJuSJ = shuJuSJ;
- }
-
- public Date getShuJuSJ()
- {
- return shuJuSJ;
- }
- public void setYiChangSJZH(BigDecimal yiChangSJZH)
- {
- this.yiChangSJZH = yiChangSJZH;
- }
-
- public BigDecimal getYiChangSJZH()
- {
- return yiChangSJZH;
- }
- public void setYiChangSJSL(BigDecimal yiChangSJSL)
- {
- this.yiChangSJSL = yiChangSJSL;
- }
-
- public BigDecimal getYiChangSJSL()
- {
- return yiChangSJSL;
- }
-
- public Integer getShiFouFS() {
- return shiFouFS;
- }
-
- public void setShiFouFS(Integer shiFouFS) {
- this.shiFouFS = shiFouFS;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("ceDianBM", getCeDianBM())
- .append("ceDianLXBM", getCeDianLXBM())
- .append("ceDianLXMC", getCeDianLXMC())
- .append("suoShuSBBM", getSuoShuSBBM())
- .append("yiChangLX", getYiChangLX())
- .append("yiChangKSSJ", getYiChangKSSJ())
- .append("yiChangJSSJ", getYiChangJSSJ())
- .append("yiChangQJZDZ", getYiChangQJZDZ())
- .append("zuiDaZSK", getZuiDaZSK())
- .append("yiChangQJZXZ", getYiChangQJZXZ())
- .append("zuiXiaoZSK", getZuiXiaoZSK())
- .append("yiChangQJPJZ", getYiChangQJPJZ())
- .append("shuJuSJ", getShuJuSJ())
- .append("yiChangSJZH", getYiChangSJZH())
- .append("yiChangSJSL", getYiChangSJSL())
- .append("shiFouFS", getShiFouFS())
- .toString();
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdMapper.java
deleted file mode 100644
index 51875a0..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdMapper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.ruoyi.dl.mapper;
-
-import java.util.List;
-
-import com.ruoyi.dl.domain.DlShebeixx;
-import com.ruoyi.dl.domain.DlShebeixxCd;
-import com.ruoyi.dl.domain.DlShebeixxCdSssj;
-
-/**
- * 璁惧娴嬬偣Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public interface DlShebeixxCdMapper
-{
- /**
- * 鏌ヨ璁惧娴嬬偣
- *
- * @param id 璁惧娴嬬偣涓婚敭
- * @return 璁惧娴嬬偣
- */
- public DlShebeixxCd selectDlShebeixxCdById(Long id);
-
- /**
- * 鏌ヨ璁惧娴嬬偣鍒楄〃
- *
- * @param dlShebeixxCd 璁惧娴嬬偣
- * @return 璁惧娴嬬偣闆嗗悎
- */
- public List<DlShebeixxCd> selectDlShebeixxCdList(DlShebeixxCd dlShebeixxCd);
-
- /**
- * 鏌ヨ璁惧淇℃伅鍒楄〃
- *
- * @return 璁惧淇℃伅闆嗗悎
- */
- public List<DlShebeixxCd> selectListByGroupBy(DlShebeixxCd dlShebeixxCd);
-
- /**
- * 鏂板璁惧娴嬬偣
- *
- * @param dlShebeixxCd 璁惧娴嬬偣
- * @return 缁撴灉
- */
- public int insertDlShebeixxCd(DlShebeixxCd dlShebeixxCd);
-
- /**
- * 淇敼璁惧娴嬬偣
- *
- * @param dlShebeixxCd 璁惧娴嬬偣
- * @return 缁撴灉
- */
- public int updateDlShebeixxCd(DlShebeixxCd dlShebeixxCd);
-
- /**
- * 鍒犻櫎璁惧娴嬬偣
- *
- * @param id 璁惧娴嬬偣涓婚敭
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎璁惧娴嬬偣
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdByIds(Long[] ids);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdSssjMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdSssjMapper.java
deleted file mode 100644
index a166d30..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdSssjMapper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.ruoyi.dl.mapper;
-
-import java.util.List;
-
-import com.ruoyi.dl.domain.DlShebeixx;
-import com.ruoyi.dl.domain.DlShebeixxCdSssj;
-import com.ruoyi.dl.domain.DlShebeixxCdYcsj;
-
-/**
- * 璁惧娴嬬偣瀹炴椂鏁版嵁Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public interface DlShebeixxCdSssjMapper
-{
- /**
- * 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param id 璁惧娴嬬偣瀹炴椂鏁版嵁涓婚敭
- * @return 璁惧娴嬬偣瀹炴椂鏁版嵁
- */
- public DlShebeixxCdSssj selectDlShebeixxCdSssjById(Long id);
-
- /**
- * 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁鍒楄〃
- *
- * @param dlShebeixxCdSssj 璁惧娴嬬偣瀹炴椂鏁版嵁
- * @return 璁惧娴嬬偣瀹炴椂鏁版嵁闆嗗悎
- */
- public List<DlShebeixxCdSssj> selectDlShebeixxCdSssjList(DlShebeixxCdSssj dlShebeixxCdSssj);
-
- /**
- * 鏌ヨ璁惧淇℃伅鍒楄〃
- *
- * @return 璁惧淇℃伅闆嗗悎
- */
- public List<DlShebeixxCdSssj> selectListByGroupBy(DlShebeixxCdSssj dlShebeixxCdSssj);
-
- /**
- * 鏂板璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param dlShebeixxCdSssj 璁惧娴嬬偣瀹炴椂鏁版嵁
- * @return 缁撴灉
- */
- public int insertDlShebeixxCdSssj(DlShebeixxCdSssj dlShebeixxCdSssj);
-
- /**
- * 淇敼璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param dlShebeixxCdSssj 璁惧娴嬬偣瀹炴椂鏁版嵁
- * @return 缁撴灉
- */
- public int updateDlShebeixxCdSssj(DlShebeixxCdSssj dlShebeixxCdSssj);
-
- /**
- * 鍒犻櫎璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param id 璁惧娴嬬偣瀹炴椂鏁版嵁涓婚敭
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdSssjById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdSssjByIds(Long[] ids);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdYcsjMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdYcsjMapper.java
deleted file mode 100644
index c0d1e02..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdYcsjMapper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.ruoyi.dl.mapper;
-
-import java.util.List;
-
-import com.ruoyi.dl.domain.DlShebeixx;
-import com.ruoyi.dl.domain.DlShebeixxCdYcsj;
-
-/**
- * 璁惧娴嬬偣寮傚父鏁版嵁Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public interface DlShebeixxCdYcsjMapper
-{
- /**
- * 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param id 璁惧娴嬬偣寮傚父鏁版嵁涓婚敭
- * @return 璁惧娴嬬偣寮傚父鏁版嵁
- */
- public DlShebeixxCdYcsj selectDlShebeixxCdYcsjById(Long id);
-
- /**
- * 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁鍒楄〃
- *
- * @param dlShebeixxCdYcsj 璁惧娴嬬偣寮傚父鏁版嵁
- * @return 璁惧娴嬬偣寮傚父鏁版嵁闆嗗悎
- */
- public List<DlShebeixxCdYcsj> selectDlShebeixxCdYcsjList(DlShebeixxCdYcsj dlShebeixxCdYcsj);
-
- /**
- * 鏌ヨ璁惧淇℃伅鍒楄〃
- *
- * @return 璁惧淇℃伅闆嗗悎
- */
- public List<DlShebeixxCdYcsj> selectListByGroupBy(DlShebeixxCdYcsj dlShebeixxCdYcsj);
-
- /**
- * 鏂板璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param dlShebeixxCdYcsj 璁惧娴嬬偣寮傚父鏁版嵁
- * @return 缁撴灉
- */
- public int insertDlShebeixxCdYcsj(DlShebeixxCdYcsj dlShebeixxCdYcsj);
-
- /**
- * 淇敼璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param dlShebeixxCdYcsj 璁惧娴嬬偣寮傚父鏁版嵁
- * @return 缁撴灉
- */
- public int updateDlShebeixxCdYcsj(DlShebeixxCdYcsj dlShebeixxCdYcsj);
-
- /**
- * 鍒犻櫎璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param id 璁惧娴嬬偣寮傚父鏁版嵁涓婚敭
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdYcsjById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdYcsjByIds(Long[] ids);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxMapper.java
deleted file mode 100644
index 8965855..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxMapper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.dl.mapper;
-
-import java.util.List;
-import com.ruoyi.dl.domain.DlShebeixx;
-
-/**
- * 璁惧淇℃伅Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public interface DlShebeixxMapper
-{
- /**
- * 鏌ヨ璁惧淇℃伅
- *
- * @param id 璁惧淇℃伅涓婚敭
- * @return 璁惧淇℃伅
- */
- public DlShebeixx selectDlShebeixxById(Long id);
-
- /**
- * 鏌ヨ璁惧淇℃伅鍒楄〃
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 璁惧淇℃伅闆嗗悎
- */
- public List<DlShebeixx> selectDlShebeixxList(DlShebeixx dlShebeixx);
-
- /**
- * 鏌ヨ璁惧淇℃伅鍒楄〃
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 璁惧淇℃伅闆嗗悎
- */
- public List<DlShebeixx> selectListByGroupBy(DlShebeixx dlShebeixx);
-
- /**
- * 鏂板璁惧淇℃伅
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 缁撴灉
- */
- public int insertDlShebeixx(DlShebeixx dlShebeixx);
-
- /**
- * 淇敼璁惧淇℃伅
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 缁撴灉
- */
- public int updateDlShebeixx(DlShebeixx dlShebeixx);
-
- /**
- * 鍒犻櫎璁惧淇℃伅
- *
- * @param id 璁惧淇℃伅涓婚敭
- * @return 缁撴灉
- */
- public int deleteDlShebeixxById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎璁惧淇℃伅
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteDlShebeixxByIds(Long[] ids);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdService.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdService.java
deleted file mode 100644
index ac713b6..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.dl.service;
-
-import java.util.List;
-import com.ruoyi.dl.domain.DlShebeixxCd;
-
-/**
- * 璁惧娴嬬偣Service鎺ュ彛
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public interface IDlShebeixxCdService
-{
- /**
- * 鏌ヨ璁惧娴嬬偣
- *
- * @param id 璁惧娴嬬偣涓婚敭
- * @return 璁惧娴嬬偣
- */
- public DlShebeixxCd selectDlShebeixxCdById(Long id);
-
- /**
- * 鏌ヨ璁惧娴嬬偣鍒楄〃
- *
- * @param dlShebeixxCd 璁惧娴嬬偣
- * @return 璁惧娴嬬偣闆嗗悎
- */
- public List<DlShebeixxCd> selectDlShebeixxCdList(DlShebeixxCd dlShebeixxCd);
-
- /**
- * 鏌ヨ璁惧娴嬬偣鍒楄〃
- *
- * @param dlShebeixxCd 璁惧娴嬬偣
- * @return 璁惧娴嬬偣闆嗗悎
- */
- public List<DlShebeixxCd> selectListByGroupBy(DlShebeixxCd dlShebeixxCd);
-
- /**
- * 鏂板璁惧娴嬬偣
- *
- * @param dlShebeixxCd 璁惧娴嬬偣
- * @return 缁撴灉
- */
- public int insertDlShebeixxCd(DlShebeixxCd dlShebeixxCd);
-
- /**
- * 淇敼璁惧娴嬬偣
- *
- * @param dlShebeixxCd 璁惧娴嬬偣
- * @return 缁撴灉
- */
- public int updateDlShebeixxCd(DlShebeixxCd dlShebeixxCd);
-
- /**
- * 鎵归噺鍒犻櫎璁惧娴嬬偣
- *
- * @param ids 闇�瑕佸垹闄ょ殑璁惧娴嬬偣涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdByIds(Long[] ids);
-
- /**
- * 鍒犻櫎璁惧娴嬬偣淇℃伅
- *
- * @param id 璁惧娴嬬偣涓婚敭
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdById(Long id);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdSssjService.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdSssjService.java
deleted file mode 100644
index f4b8661..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdSssjService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.dl.service;
-
-import java.util.List;
-import com.ruoyi.dl.domain.DlShebeixxCdSssj;
-
-/**
- * 璁惧娴嬬偣瀹炴椂鏁版嵁Service鎺ュ彛
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public interface IDlShebeixxCdSssjService
-{
- /**
- * 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param id 璁惧娴嬬偣瀹炴椂鏁版嵁涓婚敭
- * @return 璁惧娴嬬偣瀹炴椂鏁版嵁
- */
- public DlShebeixxCdSssj selectDlShebeixxCdSssjById(Long id);
-
- /**
- * 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁鍒楄〃
- *
- * @param dlShebeixxCdSssj 璁惧娴嬬偣瀹炴椂鏁版嵁
- * @return 璁惧娴嬬偣瀹炴椂鏁版嵁闆嗗悎
- */
- public List<DlShebeixxCdSssj> selectDlShebeixxCdSssjList(DlShebeixxCdSssj dlShebeixxCdSssj);
-
- /**
- * 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁鍒楄〃
- *
- * @param dlShebeixxCdSssj 璁惧娴嬬偣瀹炴椂鏁版嵁
- * @return 璁惧娴嬬偣瀹炴椂鏁版嵁闆嗗悎
- */
- public List<DlShebeixxCdSssj> selectListByGroupBy(DlShebeixxCdSssj dlShebeixxCdSssj);
-
- /**
- * 鏂板璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param dlShebeixxCdSssj 璁惧娴嬬偣瀹炴椂鏁版嵁
- * @return 缁撴灉
- */
- public int insertDlShebeixxCdSssj(DlShebeixxCdSssj dlShebeixxCdSssj);
-
- /**
- * 淇敼璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param dlShebeixxCdSssj 璁惧娴嬬偣瀹炴椂鏁版嵁
- * @return 缁撴灉
- */
- public int updateDlShebeixxCdSssj(DlShebeixxCdSssj dlShebeixxCdSssj);
-
- /**
- * 鎵归噺鍒犻櫎璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param ids 闇�瑕佸垹闄ょ殑璁惧娴嬬偣瀹炴椂鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdSssjByIds(Long[] ids);
-
- /**
- * 鍒犻櫎璁惧娴嬬偣瀹炴椂鏁版嵁淇℃伅
- *
- * @param id 璁惧娴嬬偣瀹炴椂鏁版嵁涓婚敭
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdSssjById(Long id);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdYcsjService.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdYcsjService.java
deleted file mode 100644
index 7d90640..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdYcsjService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.dl.service;
-
-import java.util.List;
-import com.ruoyi.dl.domain.DlShebeixxCdYcsj;
-
-/**
- * 璁惧娴嬬偣寮傚父鏁版嵁Service鎺ュ彛
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public interface IDlShebeixxCdYcsjService
-{
- /**
- * 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param id 璁惧娴嬬偣寮傚父鏁版嵁涓婚敭
- * @return 璁惧娴嬬偣寮傚父鏁版嵁
- */
- public DlShebeixxCdYcsj selectDlShebeixxCdYcsjById(Long id);
-
- /**
- * 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁鍒楄〃
- *
- * @param dlShebeixxCdYcsj 璁惧娴嬬偣寮傚父鏁版嵁
- * @return 璁惧娴嬬偣寮傚父鏁版嵁闆嗗悎
- */
- public List<DlShebeixxCdYcsj> selectDlShebeixxCdYcsjList(DlShebeixxCdYcsj dlShebeixxCdYcsj);
-
- /**
- * 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁鍒楄〃
- *
- * @param dlShebeixxCdYcsj 璁惧娴嬬偣寮傚父鏁版嵁
- * @return 璁惧娴嬬偣寮傚父鏁版嵁闆嗗悎
- */
- public List<DlShebeixxCdYcsj> selectListByGroupBy(DlShebeixxCdYcsj dlShebeixxCdYcsj);
-
- /**
- * 鏂板璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param dlShebeixxCdYcsj 璁惧娴嬬偣寮傚父鏁版嵁
- * @return 缁撴灉
- */
- public int insertDlShebeixxCdYcsj(DlShebeixxCdYcsj dlShebeixxCdYcsj);
-
- /**
- * 淇敼璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param dlShebeixxCdYcsj 璁惧娴嬬偣寮傚父鏁版嵁
- * @return 缁撴灉
- */
- public int updateDlShebeixxCdYcsj(DlShebeixxCdYcsj dlShebeixxCdYcsj);
-
- /**
- * 鎵归噺鍒犻櫎璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param ids 闇�瑕佸垹闄ょ殑璁惧娴嬬偣寮傚父鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdYcsjByIds(Long[] ids);
-
- /**
- * 鍒犻櫎璁惧娴嬬偣寮傚父鏁版嵁淇℃伅
- *
- * @param id 璁惧娴嬬偣寮傚父鏁版嵁涓婚敭
- * @return 缁撴灉
- */
- public int deleteDlShebeixxCdYcsjById(Long id);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxService.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxService.java
deleted file mode 100644
index c46445c..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.dl.service;
-
-import java.util.List;
-import com.ruoyi.dl.domain.DlShebeixx;
-
-/**
- * 璁惧淇℃伅Service鎺ュ彛
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-public interface IDlShebeixxService
-{
- /**
- * 鏌ヨ璁惧淇℃伅
- *
- * @param id 璁惧淇℃伅涓婚敭
- * @return 璁惧淇℃伅
- */
- public DlShebeixx selectDlShebeixxById(Long id);
-
- /**
- * 鏌ヨ璁惧淇℃伅鍒楄〃
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 璁惧淇℃伅闆嗗悎
- */
- public List<DlShebeixx> selectDlShebeixxList(DlShebeixx dlShebeixx);
-
- /**
- * 鏌ヨ璁惧淇℃伅鍒楄〃
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 璁惧淇℃伅闆嗗悎
- */
- public List<DlShebeixx> selectListByGroupBy(DlShebeixx dlShebeixx);
-
- /**
- * 鏂板璁惧淇℃伅
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 缁撴灉
- */
- public int insertDlShebeixx(DlShebeixx dlShebeixx);
-
- /**
- * 淇敼璁惧淇℃伅
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 缁撴灉
- */
- public int updateDlShebeixx(DlShebeixx dlShebeixx);
-
- /**
- * 鎵归噺鍒犻櫎璁惧淇℃伅
- *
- * @param ids 闇�瑕佸垹闄ょ殑璁惧淇℃伅涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteDlShebeixxByIds(Long[] ids);
-
- /**
- * 鍒犻櫎璁惧淇℃伅淇℃伅
- *
- * @param id 璁惧淇℃伅涓婚敭
- * @return 缁撴灉
- */
- public int deleteDlShebeixxById(Long id);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdServiceImpl.java
deleted file mode 100644
index 447e197..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdServiceImpl.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.ruoyi.dl.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.dl.mapper.DlShebeixxCdMapper;
-import com.ruoyi.dl.domain.DlShebeixxCd;
-import com.ruoyi.dl.service.IDlShebeixxCdService;
-
-/**
- * 璁惧娴嬬偣Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-@Service
-public class DlShebeixxCdServiceImpl implements IDlShebeixxCdService
-{
- @Autowired
- private DlShebeixxCdMapper dlShebeixxCdMapper;
-
- /**
- * 鏌ヨ璁惧娴嬬偣
- *
- * @param id 璁惧娴嬬偣涓婚敭
- * @return 璁惧娴嬬偣
- */
- @Override
- public DlShebeixxCd selectDlShebeixxCdById(Long id)
- {
- return dlShebeixxCdMapper.selectDlShebeixxCdById(id);
- }
-
- /**
- * 鏌ヨ璁惧娴嬬偣鍒楄〃
- *
- * @param dlShebeixxCd 璁惧娴嬬偣
- * @return 璁惧娴嬬偣
- */
- @Override
- public List<DlShebeixxCd> selectDlShebeixxCdList(DlShebeixxCd dlShebeixxCd)
- {
- return dlShebeixxCdMapper.selectDlShebeixxCdList(dlShebeixxCd);
- }
-
- /**
- * 鏌ヨ璁惧娴嬬偣鍒楄〃
- *
- * @param dlShebeixxCd 璁惧娴嬬偣
- * @return 璁惧娴嬬偣
- */
- @Override
- public List<DlShebeixxCd> selectListByGroupBy(DlShebeixxCd dlShebeixxCd)
- {
- return dlShebeixxCdMapper.selectListByGroupBy(dlShebeixxCd);
- }
-
- /**
- * 鏂板璁惧娴嬬偣
- *
- * @param dlShebeixxCd 璁惧娴嬬偣
- * @return 缁撴灉
- */
- @Override
- public int insertDlShebeixxCd(DlShebeixxCd dlShebeixxCd)
- {
- return dlShebeixxCdMapper.insertDlShebeixxCd(dlShebeixxCd);
- }
-
- /**
- * 淇敼璁惧娴嬬偣
- *
- * @param dlShebeixxCd 璁惧娴嬬偣
- * @return 缁撴灉
- */
- @Override
- public int updateDlShebeixxCd(DlShebeixxCd dlShebeixxCd)
- {
- return dlShebeixxCdMapper.updateDlShebeixxCd(dlShebeixxCd);
- }
-
- /**
- * 鎵归噺鍒犻櫎璁惧娴嬬偣
- *
- * @param ids 闇�瑕佸垹闄ょ殑璁惧娴嬬偣涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteDlShebeixxCdByIds(Long[] ids)
- {
- return dlShebeixxCdMapper.deleteDlShebeixxCdByIds(ids);
- }
-
- /**
- * 鍒犻櫎璁惧娴嬬偣淇℃伅
- *
- * @param id 璁惧娴嬬偣涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteDlShebeixxCdById(Long id)
- {
- return dlShebeixxCdMapper.deleteDlShebeixxCdById(id);
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdSssjServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdSssjServiceImpl.java
deleted file mode 100644
index a7bb661..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdSssjServiceImpl.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.ruoyi.dl.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.dl.mapper.DlShebeixxCdSssjMapper;
-import com.ruoyi.dl.domain.DlShebeixxCdSssj;
-import com.ruoyi.dl.service.IDlShebeixxCdSssjService;
-
-/**
- * 璁惧娴嬬偣瀹炴椂鏁版嵁Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-@Service
-public class DlShebeixxCdSssjServiceImpl implements IDlShebeixxCdSssjService
-{
- @Autowired
- private DlShebeixxCdSssjMapper dlShebeixxCdSssjMapper;
-
- /**
- * 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param id 璁惧娴嬬偣瀹炴椂鏁版嵁涓婚敭
- * @return 璁惧娴嬬偣瀹炴椂鏁版嵁
- */
- @Override
- public DlShebeixxCdSssj selectDlShebeixxCdSssjById(Long id)
- {
- return dlShebeixxCdSssjMapper.selectDlShebeixxCdSssjById(id);
- }
-
- /**
- * 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁鍒楄〃
- *
- * @param dlShebeixxCdSssj 璁惧娴嬬偣瀹炴椂鏁版嵁
- * @return 璁惧娴嬬偣瀹炴椂鏁版嵁
- */
- @Override
- public List<DlShebeixxCdSssj> selectDlShebeixxCdSssjList(DlShebeixxCdSssj dlShebeixxCdSssj)
- {
- return dlShebeixxCdSssjMapper.selectDlShebeixxCdSssjList(dlShebeixxCdSssj);
- }
-
- /**
- * 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁鍒楄〃
- *
- * @param dlShebeixxCdSssj 璁惧娴嬬偣瀹炴椂鏁版嵁
- * @return 璁惧娴嬬偣瀹炴椂鏁版嵁
- */
- @Override
- public List<DlShebeixxCdSssj> selectListByGroupBy(DlShebeixxCdSssj dlShebeixxCdSssj)
- {
- return dlShebeixxCdSssjMapper.selectListByGroupBy(dlShebeixxCdSssj);
- }
-
- /**
- * 鏂板璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param dlShebeixxCdSssj 璁惧娴嬬偣瀹炴椂鏁版嵁
- * @return 缁撴灉
- */
- @Override
- public int insertDlShebeixxCdSssj(DlShebeixxCdSssj dlShebeixxCdSssj)
- {
- return dlShebeixxCdSssjMapper.insertDlShebeixxCdSssj(dlShebeixxCdSssj);
- }
-
- /**
- * 淇敼璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param dlShebeixxCdSssj 璁惧娴嬬偣瀹炴椂鏁版嵁
- * @return 缁撴灉
- */
- @Override
- public int updateDlShebeixxCdSssj(DlShebeixxCdSssj dlShebeixxCdSssj)
- {
- return dlShebeixxCdSssjMapper.updateDlShebeixxCdSssj(dlShebeixxCdSssj);
- }
-
- /**
- * 鎵归噺鍒犻櫎璁惧娴嬬偣瀹炴椂鏁版嵁
- *
- * @param ids 闇�瑕佸垹闄ょ殑璁惧娴嬬偣瀹炴椂鏁版嵁涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteDlShebeixxCdSssjByIds(Long[] ids)
- {
- return dlShebeixxCdSssjMapper.deleteDlShebeixxCdSssjByIds(ids);
- }
-
- /**
- * 鍒犻櫎璁惧娴嬬偣瀹炴椂鏁版嵁淇℃伅
- *
- * @param id 璁惧娴嬬偣瀹炴椂鏁版嵁涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteDlShebeixxCdSssjById(Long id)
- {
- return dlShebeixxCdSssjMapper.deleteDlShebeixxCdSssjById(id);
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdYcsjServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdYcsjServiceImpl.java
deleted file mode 100644
index 64938d0..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdYcsjServiceImpl.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.ruoyi.dl.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.dl.mapper.DlShebeixxCdYcsjMapper;
-import com.ruoyi.dl.domain.DlShebeixxCdYcsj;
-import com.ruoyi.dl.service.IDlShebeixxCdYcsjService;
-
-/**
- * 璁惧娴嬬偣寮傚父鏁版嵁Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-@Service
-public class DlShebeixxCdYcsjServiceImpl implements IDlShebeixxCdYcsjService
-{
- @Autowired
- private DlShebeixxCdYcsjMapper dlShebeixxCdYcsjMapper;
-
- /**
- * 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param id 璁惧娴嬬偣寮傚父鏁版嵁涓婚敭
- * @return 璁惧娴嬬偣寮傚父鏁版嵁
- */
- @Override
- public DlShebeixxCdYcsj selectDlShebeixxCdYcsjById(Long id)
- {
- return dlShebeixxCdYcsjMapper.selectDlShebeixxCdYcsjById(id);
- }
-
- /**
- * 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁鍒楄〃
- *
- * @param dlShebeixxCdYcsj 璁惧娴嬬偣寮傚父鏁版嵁
- * @return 璁惧娴嬬偣寮傚父鏁版嵁
- */
- @Override
- public List<DlShebeixxCdYcsj> selectDlShebeixxCdYcsjList(DlShebeixxCdYcsj dlShebeixxCdYcsj)
- {
- return dlShebeixxCdYcsjMapper.selectDlShebeixxCdYcsjList(dlShebeixxCdYcsj);
- }
-
- /**
- * 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁鍒楄〃
- *
- * @param dlShebeixxCdYcsj 璁惧娴嬬偣寮傚父鏁版嵁
- * @return 璁惧娴嬬偣寮傚父鏁版嵁
- */
- @Override
- public List<DlShebeixxCdYcsj> selectListByGroupBy(DlShebeixxCdYcsj dlShebeixxCdYcsj)
- {
- return dlShebeixxCdYcsjMapper.selectListByGroupBy(dlShebeixxCdYcsj);
- }
-
- /**
- * 鏂板璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param dlShebeixxCdYcsj 璁惧娴嬬偣寮傚父鏁版嵁
- * @return 缁撴灉
- */
- @Override
- public int insertDlShebeixxCdYcsj(DlShebeixxCdYcsj dlShebeixxCdYcsj)
- {
- return dlShebeixxCdYcsjMapper.insertDlShebeixxCdYcsj(dlShebeixxCdYcsj);
- }
-
- /**
- * 淇敼璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param dlShebeixxCdYcsj 璁惧娴嬬偣寮傚父鏁版嵁
- * @return 缁撴灉
- */
- @Override
- public int updateDlShebeixxCdYcsj(DlShebeixxCdYcsj dlShebeixxCdYcsj)
- {
- return dlShebeixxCdYcsjMapper.updateDlShebeixxCdYcsj(dlShebeixxCdYcsj);
- }
-
- /**
- * 鎵归噺鍒犻櫎璁惧娴嬬偣寮傚父鏁版嵁
- *
- * @param ids 闇�瑕佸垹闄ょ殑璁惧娴嬬偣寮傚父鏁版嵁涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteDlShebeixxCdYcsjByIds(Long[] ids)
- {
- return dlShebeixxCdYcsjMapper.deleteDlShebeixxCdYcsjByIds(ids);
- }
-
- /**
- * 鍒犻櫎璁惧娴嬬偣寮傚父鏁版嵁淇℃伅
- *
- * @param id 璁惧娴嬬偣寮傚父鏁版嵁涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteDlShebeixxCdYcsjById(Long id)
- {
- return dlShebeixxCdYcsjMapper.deleteDlShebeixxCdYcsjById(id);
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxServiceImpl.java
deleted file mode 100644
index 42d05aa..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxServiceImpl.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.ruoyi.dl.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.dl.mapper.DlShebeixxMapper;
-import com.ruoyi.dl.domain.DlShebeixx;
-import com.ruoyi.dl.service.IDlShebeixxService;
-
-/**
- * 璁惧淇℃伅Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2023-09-13
- */
-@Service
-public class DlShebeixxServiceImpl implements IDlShebeixxService
-{
- @Autowired
- private DlShebeixxMapper dlShebeixxMapper;
-
- /**
- * 鏌ヨ璁惧淇℃伅
- *
- * @param id 璁惧淇℃伅涓婚敭
- * @return 璁惧淇℃伅
- */
- @Override
- public DlShebeixx selectDlShebeixxById(Long id)
- {
- return dlShebeixxMapper.selectDlShebeixxById(id);
- }
-
- /**
- * 鏌ヨ璁惧淇℃伅鍒楄〃
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 璁惧淇℃伅
- */
- @Override
- public List<DlShebeixx> selectDlShebeixxList(DlShebeixx dlShebeixx)
- {
- return dlShebeixxMapper.selectDlShebeixxList(dlShebeixx);
- }
-
- /**
- * 鏌ヨ璁惧淇℃伅鍒楄〃
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 璁惧淇℃伅
- */
- @Override
- public List<DlShebeixx> selectListByGroupBy(DlShebeixx dlShebeixx)
- {
- return dlShebeixxMapper.selectListByGroupBy(dlShebeixx);
- }
-
- /**
- * 鏂板璁惧淇℃伅
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 缁撴灉
- */
- @Override
- public int insertDlShebeixx(DlShebeixx dlShebeixx)
- {
- return dlShebeixxMapper.insertDlShebeixx(dlShebeixx);
- }
-
- /**
- * 淇敼璁惧淇℃伅
- *
- * @param dlShebeixx 璁惧淇℃伅
- * @return 缁撴灉
- */
- @Override
- public int updateDlShebeixx(DlShebeixx dlShebeixx)
- {
- return dlShebeixxMapper.updateDlShebeixx(dlShebeixx);
- }
-
- /**
- * 鎵归噺鍒犻櫎璁惧淇℃伅
- *
- * @param ids 闇�瑕佸垹闄ょ殑璁惧淇℃伅涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteDlShebeixxByIds(Long[] ids)
- {
- return dlShebeixxMapper.deleteDlShebeixxByIds(ids);
- }
-
- /**
- * 鍒犻櫎璁惧淇℃伅淇℃伅
- *
- * @param id 璁惧淇℃伅涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteDlShebeixxById(Long id)
- {
- return dlShebeixxMapper.deleteDlShebeixxById(id);
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/task/AiBrainTask.java b/ruoyi-admin/src/main/java/com/ruoyi/task/AiBrainTask.java
index b40c905..2dd8dde 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/task/AiBrainTask.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/task/AiBrainTask.java
@@ -1,30 +1,18 @@
package com.ruoyi.task;
-import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.activeMQ.vo.CameraControlVO;
import com.ruoyi.aibrain.domain.AiAlarmInfo;
-import com.ruoyi.aibrain.domain.AiCamera;
-import com.ruoyi.aibrain.domain.Point;
import com.ruoyi.aibrain.service.IAiAlarmInfoService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.Threads;
-import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.config.ActiveManager;
import com.ruoyi.framework.websocket.WebSocketUsers;
-import com.ruoyi.utils.Base64Util;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.ActiveMQTopic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cglib.beans.BeanCopier;
import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import javax.jms.Destination;
-import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@@ -41,8 +29,6 @@
public class AiBrainTask {
private static final Logger logger = LoggerFactory.getLogger(Threads.class);
-
- private static BeanCopier copier = BeanCopier.create(AiCamera.class, CameraControlVO.class, false);
@Autowired
private static ActiveManager activeManager;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/task/DataAssembleUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/task/DataAssembleUtil.java
deleted file mode 100644
index a843ce8..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/task/DataAssembleUtil.java
+++ /dev/null
@@ -1,514 +0,0 @@
-package com.ruoyi.task;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.common.utils.uuid.UUID;
-import com.ruoyi.dl.domain.DlShebeixx;
-import com.ruoyi.dl.domain.DlShebeixxCd;
-import com.ruoyi.dl.domain.DlShebeixxCdSssj;
-import com.ruoyi.dl.domain.DlShebeixxCdYcsj;
-import com.ruoyi.dl.service.IDlShebeixxCdService;
-import com.ruoyi.dl.service.IDlShebeixxCdSssjService;
-import com.ruoyi.dl.service.IDlShebeixxCdYcsjService;
-import com.ruoyi.dl.service.IDlShebeixxService;
-import com.ruoyi.interchange.domain.TbDataSendRecords;
-import com.ruoyi.interchange.service.ITbDataSendRecordsService;
-import com.ruoyi.utils.FileUtil;
-import com.ruoyi.utils.FtpUtils;
-import sun.applet.Main;
-
-import java.io.File;
-import java.nio.charset.Charset;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-public class DataAssembleUtil {
-
- private static IDlShebeixxService dlShebeixxService;
- private static IDlShebeixxCdService dlShebeixxCdService;
- private static IDlShebeixxCdSssjService dlShebeixxCdSssjService;
- private static IDlShebeixxCdYcsjService dlShebeixxCdYcsjService;
- private static ITbDataSendRecordsService tbDataSendRecordsService;
- private static RedisCache redisCache;
-
- //涓�鐭�:鐓ょ熆缂栫爜 220181014879
- //浜岀熆:鐓ょ熆缂栫爜 220181014860
- private static String MKBM= RuoYiConfig.getMkbm(); //鐓ょ熆缂栫爜
- private static String MKMC= RuoYiConfig.getMkmc(); //鐓ょ熆鍚嶇О
- private static String SCCJ="寰愬窞鐝傚皵鐜涚鎶�鏈夐檺鍏徃"; //鐢熶骇鍘傚鍚嶇О
- private static String XTXH="KEM2023DLJKXT"; //绯荤粺鍨嬪彿
- private static String XTMC="渚涚數鐩戞帶绯荤粺"; //绯荤粺鍚嶇О
-
- private static SimpleDateFormat YMDformat = new SimpleDateFormat("yyyy-MM-dd");
- private static SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
- private static SimpleDateFormat formatYMD = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- private static SimpleDateFormat YMD_format = new SimpleDateFormat("yyyy/MM/dd");
-
- static {
- dlShebeixxService = SpringUtils.getBean(IDlShebeixxService.class);
- dlShebeixxCdService = SpringUtils.getBean(IDlShebeixxCdService.class);
- dlShebeixxCdSssjService = SpringUtils.getBean(IDlShebeixxCdSssjService.class);
- dlShebeixxCdYcsjService = SpringUtils.getBean(IDlShebeixxCdYcsjService.class);
- tbDataSendRecordsService = SpringUtils.getBean(ITbDataSendRecordsService.class);
- redisCache = SpringUtils.getBean(RedisCache.class);
- }
-
- /*绯荤粺鍚嶇О 绯荤粺绠�绉� 鏂囦欢鍒嗙被 璇存槑
- 鍙樼數绔欒澶囧熀鏈俊鎭� bdsj GDSB 鍙樼數绔欒澶囧熀鏈俊鎭�
- 鍙樼數绔欒澶囩洃娴嬬郴缁� gdjc GDJC 鍙樼數绔欒澶囨祴鐐瑰熀纭�淇℃伅
- GDSS 鍙樼數绔欒澶囨祴鐐瑰疄鏃朵俊鎭�
- GDYC 鍙樼數绔欒澶囨祴鐐瑰紓甯镐俊鎭�
- 閲嶅ぇ璁惧鍩烘湰淇℃伅 jbsj JBSJ 閲嶅ぇ璁惧鍩烘湰淇℃伅
- 涓婚�氶鏈虹敤鐢电洃娴� tfjc TFJC 涓婚�氶鏈烘祴鐐瑰熀纭�淇℃伅
- TFSS 涓婚�氶鏈哄疄鏃朵俊鎭�
- TFYC 涓婚�氶鏈哄紓甯镐俊鎭�
- 涓绘帓姘寸敤鐢电洃娴� psjc PSJC 涓绘帓姘村熀纭�淇℃伅
- PSSS 涓绘帓姘村疄鏃朵俊鎭�
- PSYC 涓绘帓姘村紓甯镐俊鎭�
- 涓昏繍杈撶敤鐢电洃娴� zyjc ZYJC 涓昏繍杈撳熀纭�淇℃伅
- ZYSS 涓昏繍杈撳疄鏃朵俊鎭�
- ZYYC 涓昏繍杈撳紓甯镐俊鎭�
- 鎻愬崌绯荤粺鐢ㄧ數鐩戞祴 tsjc TSJC 鎻愬崌绯荤粺鍩虹淇℃伅
- TSSS 鎻愬崌绯荤粺瀹炴椂淇℃伅
- TSYC 鎻愬崌绯荤粺寮傚父淇℃伅*/
-
- //璁惧鍩烘湰淇℃伅(椤圭洰鍚姩鎴栬�呬慨鏀瑰悗鍙戦�佷竴娆�)
- public static void AssembleBDZSBJBXX(){
- List<DlShebeixx> list=dlShebeixxService.selectListByGroupBy(new DlShebeixx());
- for (int i = 0; i < list.size(); i++) {
- AssembleBDZSBJBXX_Add(list.get(i).getXiTongBM(),list.get(i).getWenJianFL());
- }
- }
-
- /**
- * @param XTBM 绯荤粺缂栫爜
- * @param WJFL 鏂囦欢鍒嗙被
- */
- public static void AssembleBDZSBJBXX_Add(String XTBM,String WJFL){
- Date nowD=new Date();
-
- //鐓ょ熆缂栫爜_GDSB_绯荤粺缂栫爜_鏁版嵁涓婁紶鏃堕棿.txt
- //鏁版嵁涓婁紶鏃堕棿鏍煎紡锛歽yyyMMddHHmmss 濡�:20190929112425
- //鏂囦欢鍚嶇ず渚嬶細140121020034_GDSB_6001_20190929112425.txt
-
-
- //鏂囦欢瀛樺偍浣嶇疆
- String url= RuoYiConfig.getProfile() + "/upload/"+MKBM+"/"+YMD_format.format(nowD)+"/"+WJFL.substring(0,2);
- File file = new File(url);
- if (!file.exists()) {
- file.mkdirs();
- }
-
- //鏂囦欢鍐呭鍖呮嫭涓ら儴鍒�:鏂囦欢澶村拰鏂囦欢浣撱��
- //鏂囦欢澶村寘鎷叅鐭跨紪鐮�;鐓ょ熆鍚嶇О;鏁版嵁涓婁紶鏃堕棿锛�3 涓瓧娈典负蹇呭～椤广�傛暟鎹笂浼犳椂闂存槸鎸囩敓鎴愯鏁版嵁鏂囦欢鐨勬椂闂淬�傚悇瀛楁浣跨敤鑻辨枃绗﹀彿鈥�;鈥濋殧寮�锛屾枃浠跺ご浠モ�渵鈥濈鍙风粨鏉熴��
- //鏂囦欢浣撴槸鐓ょ熆鎵�鏈夊彉鐢电珯璁惧鍩烘湰淇℃伅鐨勯泦鍚堛�傛瘡鏉¤澶囩殑淇℃伅鏍煎紡涓衡�滆澶囩紪鐮侊紱璁惧鍚嶇О锛涜鏍煎瀷鍙凤紱璁惧绫诲埆锛涚敓浜ф棩鏈燂紱鎵�灞炵郴缁燂紱瀹夎鏃ユ湡锛涘畨瑁呬綅缃紱鐢熶骇鍘傚锛涘嚭鍘傜紪鐮侊紱瀹夋爣璇佷功缂栧彿锛涢槻鐖嗚瘉涔︾紪鍙凤紱棰濆畾鐢靛帇锛涢瀹氱數娴侊紱棰濆畾鍔熺巼鈥濄�傛瘡涓�鏉″彉鐢电珯璁惧鍩烘湰淇℃伅鍚勫瓧娈典互鑻辨枃瀛楃鈥�;鈥濋殧寮�锛屼互鈥渵鈥濈粨鏉燂紝姣忕粍鏁版嵁浠モ�渱|鈥濈粨灏俱��
- //140121020034;XXX鐓ょ熆;2019-09-29 11:24:24~1401210200340000017633;杩涚嚎鏌�;VW-5/21;1;2019-09-01;6001;2020-09-01;涓ぎ鍙樼數鎵�;***鏈夐檺鍏徃;4103123213;MFB130444;CE071275;380;30;2500~||
-
- //鏂囦欢澶�
- String toString=MKBM+";"+MKMC+";"+formatYMD.format(nowD)+"~";
- DlShebeixx sOBJ=new DlShebeixx();
- sOBJ.setXiTongBM(XTBM);//绯荤粺缂栫爜
- sOBJ.setWenJianFL(WJFL);//鏂囦欢鍒嗙被
- List<DlShebeixx> list = dlShebeixxService.selectDlShebeixxList(sOBJ);
-
- //鏂囦欢浣�
- for (int i = 0; i < list.size(); i++) {
- DlShebeixx dlShebeixx=list.get(i);
- String objString=dlShebeixx.getSheBeiBM()+";" //璁惧缂栫爜
- +dlShebeixx.getSheBeiMC()+";" //璁惧鍚嶇О
- +dlShebeixx.getGuiGeXH()+";" //瑙勬牸鍨嬪彿
- +dlShebeixx.getSheBeiLX()+";" //璁惧绫诲埆
- +YMDformat.format(dlShebeixx.getShengChanRQ())+";" //鐢熶骇鏃ユ湡
- +dlShebeixx.getSuoShuXT()+";" //鎵�灞炵郴缁�
- +YMDformat.format(dlShebeixx.getAnZhuangRQ())+";" //瀹夎鏃ユ湡
- +dlShebeixx.getAnZhuangWZ()+";" //瀹夎浣嶇疆
- +dlShebeixx.getShengChanCJ()+";" //鐢熶骇鍘傚
- +dlShebeixx.getChuChangBM()+";" //鍑哄巶缂栫爜
- +dlShebeixx.getAnBIaoZSBH()+";" //瀹夋爣璇佷功缂栧彿
- +dlShebeixx.getFangBaoZSBH()+";" //闃茬垎璇佷功缂栧彿
- +dlShebeixx.geteDingDY()+";" //棰濆畾鐢靛帇
- +dlShebeixx.geteDingDL()+";" //棰濆畾鐢垫祦
- +dlShebeixx.geteDingGL()+"~||"; //棰濆畾鍔熺巼
-
- toString+=objString;
- }
- //鎵归噺鏇挎崲null瀛楃涓�
- toString = StringUtils.replace(toString, "null", "");
-
- String fileUrl=url + "/"+MKBM+"_"+WJFL+"_"+XTBM+"_"+format.format(nowD)+".txt";
- FileUtil.writeLogInFile(fileUrl,toString);
-
- JSONObject obj=new JSONObject();
- obj.put("type","鍙樼數绔�");
- obj.put("url",fileUrl);
- obj.put("sendSum",0);
- obj.put("fileName",MKBM+"_"+WJFL+"_"+XTBM+"_"+format.format(nowD));
- redisCache.rightPush("DataAssemble",obj);
- }
-
-
-
- //鍙樼數绔欒澶囩洃娴嬫暟鎹�(椤圭洰鍚姩鎴栬�呬慨鏀瑰悗鍙戦�佷竴娆�)
- public static void AssembleBDZSBJCSJ(){
- List<DlShebeixxCd> list=dlShebeixxCdService.selectListByGroupBy(new DlShebeixxCd());
- for (int i = 0; i < list.size(); i++) {
- AssembleBDZSBJCSJ_Add(list.get(i).getXiTongBM(),list.get(i).getWenJianFL());
- }
- }
-
- public static void AssembleBDZSBJCSJ_Add(String XTBM,String WJFL){
- Date nowD=new Date();
-
- //鐓ょ熆缂栫爜_GDJC_绯荤粺缂栫爜_鏁版嵁涓婁紶鏃堕棿.txt
- //鏁版嵁涓婁紶鏃堕棿鏍煎紡锛歽yyyMMddHHmmss 濡�:20190929112425
- //鏂囦欢鍚嶇ず渚嬶細140121020034_GDJC_6001_20190929112425.txt
-
- //鏂囦欢瀛樺偍浣嶇疆
- String url= RuoYiConfig.getProfile() + "/upload/"+MKBM+"/"+YMD_format.format(nowD)+"/"+WJFL.substring(0,2);
- File file = new File(url);
- if (!file.exists()) {
- file.mkdirs();
- }
-
- //鏂囦欢鍐呭鍖呮嫭涓ら儴鍒�:鏂囦欢澶村拰鏂囦欢浣撱��
- //鏂囦欢澶村寘鎷叅鐭跨紪鐮侊紱鐓ょ熆鍚嶇О锛涚郴缁熺紪鐮侊紱绯荤粺鍨嬪彿锛涚郴缁熷悕绉帮紱鐢熶骇鍘傚鍚嶇О锛涙暟鎹笂浼犳椂闂达紝杩� 7 涓瓧娈甸兘鏄繀濉」銆傛暟鎹笂浼犳椂闂存槸鎸囩敓鎴愯鏁版嵁鏂囦欢鐨勬椂闂淬�傚悇瀛楁浣跨敤鑻辨枃绗﹀彿鈥�;鈥濋殧寮�锛屾枃浠跺ご浠モ�渵鈥濈鍙风粨鏉熴��
- //鏂囦欢浣撴槸娴嬬偣鍩虹鏁版嵁鐨勯泦鍚堛�傛瘡鏉′俊鎭牸寮忎负鈥滄祴鐐圭紪鐮侊紱娴嬬偣绫诲瀷缂栫爜锛涙祴鐐圭被鍨嬪悕绉帮紱鎵�灞炶澶囩紪鐮侊紱娴嬬偣浣嶇疆锛涙祴閲忓�煎崟浣嶏紱閲忕▼涓婇檺锛涢噺绋嬩笅闄愶紱鎶ヨ涓婇檺锛涙姤璀︿笅闄愶紱浼犳劅鍣ㄥ叧鑱斿叧绯伙紱鏁版嵁鏃堕棿鈥濄�傛瘡涓�鏉′俊鎭悇瀛楁浠ヨ嫳鏂囧瓧绗︹��;鈥濋殧寮�锛屼互鈥渵鈥濈粨鏉燂紝姣忕粍鏁版嵁浠モ�渱|鈥濈粨灏俱��
- //140121020034;XXX鐓ょ熆;6001;KJ脳脳;渚涚數鐩戞帶绯荤粺;**鍘傚;2019-09-0110:31:24~14012102003430MN30101000000006331234;2103;鐢垫祦;1401210200345001100542;涓ぎ鍙樼數鎵�鐢垫祦鐩戞帶;A;100;0.01;80;5;;2019-09-01 10:31:24~||
-
- //鏂囦欢澶�
- String toString="";
- if(XTBM.equals("5001")){
- toString=MKBM+";"+MKMC+";"+XTBM+";"+XTXH+";"+XTMC+";"+SCCJ+";"+formatYMD.format(nowD)+"~";
- }else{
- toString=MKBM+";"+MKMC+";"+XTXH+";"+XTMC+";"+formatYMD.format(nowD)+"~";
- }
-
- DlShebeixxCd dlShebeixxCd=new DlShebeixxCd();
- dlShebeixxCd.setXiTongBM(XTBM);//绯荤粺缂栫爜
- dlShebeixxCd.setWenJianFL(WJFL);//鏂囦欢鍒嗙被
- List<DlShebeixxCd> list = dlShebeixxCdService.selectDlShebeixxCdList(dlShebeixxCd);
-
- //鏂囦欢浣�
- for (int i = 0; i < list.size(); i++) {
- DlShebeixxCd dlShebeiCD=list.get(i);
-
- String objString="";
- if(XTBM.equals("5001")){
- objString=dlShebeiCD.getCeDianBM()+";" //娴嬬偣缂栫爜
- +dlShebeiCD.getCeDianLXBM()+";" //娴嬬偣绫诲瀷缂栫爜
- +dlShebeiCD.getCeDianLXMC()+";" //娴嬬偣绫诲瀷鍚嶇О
- +dlShebeiCD.getSuoShuSBBM()+";" //鎵�灞炶澶囩紪鐮�
- +dlShebeiCD.getCeDianWZ()+";" //娴嬬偣浣嶇疆
- +dlShebeiCD.getCeLiangZDW()+";" //娴嬮噺鍊煎崟浣�
- +dlShebeiCD.getLiangChenSX()+";" //閲忕▼涓婇檺
- +dlShebeiCD.getLiangChenXX()+";" //閲忕▼涓嬮檺
- +dlShebeiCD.getBiaoJingSX()+";" //鎶ヨ涓婇檺
- +dlShebeiCD.getBiaoJingXX()+";" //鎶ヨ涓嬮檺
- +dlShebeiCD.getChuanGanQGLGX()+";" //浼犳劅鍣ㄥ叧鑱斿叧绯�
- +YMDformat.format(dlShebeiCD.getShuJuDYSJ())+"~||"; //鏁版嵁鏃堕棿
- }else{
- objString=dlShebeiCD.getCeDianBM()+";" //娴嬬偣缂栫爜
- +dlShebeiCD.getCeDianLXBM()+";" //娴嬬偣绫诲瀷缂栫爜
- +dlShebeiCD.getCeDianLXMC()+";" //娴嬬偣绫诲瀷鍚嶇О
- +dlShebeiCD.getSuoShuSBBM()+";" //鎵�灞炶澶囩紪鐮�
- +dlShebeiCD.getCeDianWZ()+";" //娴嬬偣浣嶇疆
- +dlShebeiCD.getCeLiangZDW()+";" //娴嬮噺鍊煎崟浣�
- +dlShebeiCD.getLiangChenSX()+";" //閲忕▼涓婇檺
- +dlShebeiCD.getLiangChenXX()+";" //閲忕▼涓嬮檺
- +dlShebeiCD.getBiaoJingSX()+";" //鎶ヨ涓婇檺
- +dlShebeiCD.getBiaoJingXX()+";" //鎶ヨ涓嬮檺
- +YMDformat.format(dlShebeiCD.getShuJuDYSJ())+"~||"; //鏁版嵁鏃堕棿
- }
- toString+=objString;
- }
-
- //鎵归噺鏇挎崲null瀛楃涓�
- toString = StringUtils.replace(toString, "null", "");
-
- String fileUrl=url + "/"+MKBM+"_"+WJFL+"_"+XTBM+"_"+format.format(nowD)+".txt";
- FileUtil.writeLogInFile(fileUrl,toString);
-
- JSONObject obj=new JSONObject();
- obj.put("type","娴嬬偣鏁版嵁");
- obj.put("url",fileUrl);
- obj.put("sendSum",0);
- obj.put("fileName",MKBM+"_"+WJFL+"_"+XTBM+"_"+format.format(nowD));
- redisCache.rightPush("DataAssemble",obj);
- }
-
-
-
- //娴嬬偣瀹炴椂鏁版嵁(姣�10绉掑彂閫佷竴娆�)
- public static void AssembleCDSSSJ(){
- List<DlShebeixxCdSssj> list=dlShebeixxCdSssjService.selectListByGroupBy(new DlShebeixxCdSssj());
- for (int i = 0; i < list.size(); i++) {
- AssembleCDSSSJ_Add(list.get(i).getXiTongBM(),list.get(i).getWenJianFL());
- }
- }
- public static void AssembleCDSSSJ_Add(String XTBM,String WJFL){
- Date nowD=new Date();
-
- //鐓ょ熆缂栫爜_GDSS_绯荤粺缂栫爜_鏁版嵁涓婁紶鏃堕棿.txt
- //鏁版嵁涓婁紶鏃堕棿鏍煎紡锛歽yyyMMddHHmmss 濡�:20190929112425
- //鏂囦欢鍚嶇ず渚嬶細140121020034_GDSS_6001_20190929112425.txt
- //璇存槑:鏁版嵁涓婁紶鏃堕棿鏄寚灏嗗悇娴嬬偣瀹炴椂鏁版嵁姹囨�荤敓鎴愭暟鎹枃浠剁殑鏃堕棿銆�
-
- //鏂囦欢瀛樺偍浣嶇疆
- String url= RuoYiConfig.getProfile() + "/upload/"+MKBM+"/"+YMD_format.format(nowD)+"/"+WJFL.substring(0,2);
- File file = new File(url);
- if (!file.exists()) {
- file.mkdirs();
- }
-
-
- //鏂囦欢鍐呭鍖呮嫭涓ら儴鍒�:鏂囦欢澶村拰鏂囦欢浣撱��
- //鏂囦欢澶村寘鎷叅鐭跨紪鐮�;鐭夸簳鍚嶇О;绯荤粺缂栫爜;鏁版嵁涓婁紶鏃堕棿,4 涓瓧娈典负蹇呭～椤广�傛暟鎹笂浼犳椂闂存槸鎸囩敓鎴愯鏁版嵁鏂囦欢鐨勬椂闂淬�傚悇瀛楁浣跨敤鑻辨枃绗﹀彿鈥�;鈥濋殧寮�锛屾枃浠跺ご浠モ�渵鈥濈鍙风粨鏉熴��
- //鏂囦欢浣撴槸鐓ょ熆涓嬫墍鏈夋祴鐐� 10 绉掓劅鐭ユ暟鎹殑闆嗗悎銆傛瘡鏉′俊鎭牸寮忎负鈥滄祴鐐圭紪鐮�;娴嬬偣绫诲瀷缂栫爜;娴嬬偣绫诲瀷鍚嶇О;鎵�灞炶澶囩紪鐮�;娴嬬偣鏁板��;娴嬬偣鏁板�煎崟浣�;娴嬬偣鐘舵��;鏁版嵁鏃堕棿鈥濄�傛瘡涓�鏉′俊鎭悇瀛楁浠ヨ嫳鏂囧瓧绗︹��;鈥濋殧寮�锛屼互鈥渵鈥濈粨鏉燂紝姣忕粍鏁版嵁浠モ�渱|鈥濈粨灏俱��
- //140121020034;XXX鐓ょ熆;6001;2019-09-0110:31:24~14012102003430MN30101000000006331234;500011;鐢垫祦;1401210200345001100542;5;A;0;2019-09-01 10:31:24~||
-
- //鏂囦欢澶�
- String toString="";
- if(XTBM.equals("5001")){
- toString=MKBM+";"+MKMC+";"+XTBM+";"+formatYMD.format(nowD)+"~";
- }else{
- toString=MKBM+";"+MKMC+";"+formatYMD.format(nowD)+"~";
- }
-
- DlShebeixxCdSssj dlShebeixxCdSssj=new DlShebeixxCdSssj();
- dlShebeixxCdSssj.setXiTongBM(XTBM);//绯荤粺缂栫爜
- dlShebeixxCdSssj.setWenJianFL(WJFL);//鏂囦欢鍒嗙被
- List<DlShebeixxCdSssj> list = dlShebeixxCdSssjService.selectDlShebeixxCdSssjList(dlShebeixxCdSssj);
-
- //鏂囦欢浣�
- for (int i = 0; i < list.size(); i++) {
- DlShebeixxCdSssj dlShebeiSSSJ=list.get(i);
-
- String ceDianSZ=dlShebeiSSSJ.getCeDianSZ();
-
- if(dlShebeiSSSJ.getCeDianLXBM().equals("500008")
- || dlShebeiSSSJ.getCeDianLXBM().equals("500009")
- || dlShebeiSSSJ.getCeDianLXBM().equals("500011")
- || dlShebeiSSSJ.getCeDianLXBM().equals("610005")
- || dlShebeiSSSJ.getCeDianLXBM().equals("610006")
- || dlShebeiSSSJ.getCeDianLXBM().equals("610007")
- || dlShebeiSSSJ.getCeDianLXBM().equals("610008")
- || dlShebeiSSSJ.getCeDianLXBM().equals("610009")
- || dlShebeiSSSJ.getCeDianLXBM().equals("610010")
- || dlShebeiSSSJ.getCeDianLXBM().equals("610011")
- || dlShebeiSSSJ.getCeDianLXBM().equals("610012")
- || dlShebeiSSSJ.getCeDianLXBM().equals("620003")
- || dlShebeiSSSJ.getCeDianLXBM().equals("620004")
- || dlShebeiSSSJ.getCeDianLXBM().equals("620005")
- || dlShebeiSSSJ.getCeDianLXBM().equals("620006")
- || dlShebeiSSSJ.getCeDianLXBM().equals("620007")
- || dlShebeiSSSJ.getCeDianLXBM().equals("630004")
- || dlShebeiSSSJ.getCeDianLXBM().equals("630005")
- || dlShebeiSSSJ.getCeDianLXBM().equals("630006")
- || dlShebeiSSSJ.getCeDianLXBM().equals("630007")
- || dlShebeiSSSJ.getCeDianLXBM().equals("630008")
- || dlShebeiSSSJ.getCeDianLXBM().equals("640004")
- || dlShebeiSSSJ.getCeDianLXBM().equals("640005")
- || dlShebeiSSSJ.getCeDianLXBM().equals("640006")
- || dlShebeiSSSJ.getCeDianLXBM().equals("640007")
- || dlShebeiSSSJ.getCeDianLXBM().equals("640008")){
- ceDianSZ=ceDianSZ.split("\\.")[0];
- }
-
-
- String shuJuSJ="";
-
- if(dlShebeiSSSJ.getShuJuSJ().getTime()>nowD.getTime()){
- shuJuSJ=formatYMD.format(nowD);
- }else{
- shuJuSJ=formatYMD.format(dlShebeiSSSJ.getShuJuSJ());
- }
-
-
- String objString=dlShebeiSSSJ.getCeDianBM()+";" //娴嬬偣缂栫爜
- +dlShebeiSSSJ.getCeDianLXBM()+";" //娴嬬偣绫诲瀷缂栫爜
- +dlShebeiSSSJ.getCeDianLXMC()+";" //娴嬬偣绫诲瀷鍚嶇О
- +dlShebeiSSSJ.getSuoShuSBBM()+";" //鎵�灞炶澶囩紪鐮�
- +ceDianSZ+";" //娴嬬偣鏁板��
- +dlShebeiSSSJ.getCeDianSZDW()+";" //娴嬬偣鏁板�煎崟浣�
- +dlShebeiSSSJ.getCeDianZT()+";" //娴嬬偣鐘舵��
- +shuJuSJ+"~||"; //鏁版嵁鏃堕棿
-
-
- toString+=objString;
- }
-
- //鎵归噺鏇挎崲null瀛楃涓�
- toString = StringUtils.replace(toString, "null", "");
-
- String fileUrl=url + "/"+MKBM+"_"+WJFL+"_"+XTBM+"_"+format.format(nowD)+".txt";
- FileUtil.writeLogInFile(fileUrl,toString);
-
- JSONObject obj=new JSONObject();
- obj.put("type","瀹炴椂鏁版嵁");
- obj.put("url",fileUrl);
- obj.put("sendSum",0);
- obj.put("fileName",MKBM+"_"+WJFL+"_"+XTBM+"_"+format.format(nowD));
- redisCache.rightPush("DataAssemble",obj);
- }
-
-
-
-
- //娴嬬偣寮傚父鏁版嵁(瀛樺湪寮傚父鐨勬椂鍊欐墠鍙戦��)
- public static void AssembleCDYCSJ(){
- List<DlShebeixxCdYcsj> list=dlShebeixxCdYcsjService.selectListByGroupBy(new DlShebeixxCdYcsj());
- for (int i = 0; i < list.size(); i++) {
- AssembleCDYCSJ_Add(list.get(i).getXiTongBM(),list.get(i).getWenJianFL());
- }
- }
-
- public static void AssembleCDYCSJ_Add(String XTBM,String WJFL){
- Date nowD=new Date();
-
- //鐓ょ熆缂栫爜_GDYC_绯荤粺缂栫爜_鏁版嵁涓婁紶鏃堕棿.txt
- //鏁版嵁涓婁紶鏃堕棿鏍煎紡锛歽yyyMMddHHmmss 濡�:20190929112425
- //鏂囦欢鍚嶇ず渚嬶細140121020034_GDYC_6001_20190929112425.txt
- //璇存槑:鏁版嵁涓婁紶鏃堕棿鏄寚灏嗗悇娴嬬偣寮傚父鏁版嵁姹囨�荤敓鎴愭暟鎹枃浠剁殑鏃堕棿銆�
-
- //鏂囦欢瀛樺偍浣嶇疆
- String url= RuoYiConfig.getProfile() + "/upload/"+MKBM+"/"+YMD_format.format(nowD)+"/"+WJFL.substring(0,2);
- File file = new File(url);
- if (!file.exists()) {
- file.mkdirs();
- }
-
-
- //鏂囦欢鍐呭鍖呮嫭涓ら儴鍒�:鏂囦欢澶村拰鏂囦欢浣撱��
- //鏂囦欢澶村寘鎷叅鐭跨紪鐮�;鐭夸簳鍚嶇О;绯荤粺缂栫爜;鏁版嵁涓婁紶鏃堕棿,4 涓瓧娈典负蹇呭～椤广�傛暟鎹笂浼犳椂闂存槸鎸囩敓鎴愯鏁版嵁鏂囦欢鐨勬椂闂淬�傚悇瀛楁浣跨敤鑻辨枃绗﹀彿鈥�;鈥濋殧寮�锛屾枃浠跺ご浠モ�渵鈥濈鍙风粨鏉熴��
- //鏂囦欢浣撴槸鐓ょ熆涓嬫墍鏈夋祴鐐瑰紓甯告劅鐭ユ暟鎹殑闆嗗悎銆傛瘡鏉′俊鎭牸寮忎负鈥滄祴鐐圭紪鐮�;娴嬬偣绫诲瀷缂栫爜;娴嬬偣绫诲瀷鍚嶇О;鎵�灞炶澶囩紪鐮�;寮傚父绫诲瀷;寮傚父寮�濮嬫椂闂�;寮傚父缁撴潫鏃堕棿;寮傚父鏈熼棿鏈�澶у��;鏈�澶у�兼椂鍒�;寮傚父鏈熼棿鏈�灏忓��;鏈�灏忓�兼椂鍒�;寮傚父鏈熼棿骞冲潎鍊�;鏁版嵁鏃堕棿鈥濄�傛瘡涓�鏉′俊鎭悇瀛楁浠ヨ嫳鏂囧瓧绗︹��;鈥濋殧寮�锛屼互鈥渵鈥濈粨鏉燂紝姣忕粍鏁版嵁浠モ�渱|鈥濈粨灏俱��
- //140121020034;XXX鐓ょ熆;6001;2019-09-0110:31:24~14012102003430MN30101000000006331234;500010;鐢垫祦;1401210200345001100542;1;2019-09-0110:25:24;8;2019-09-0110:27:24;5; 2019-09-0110:26:24;6.2;2019-09-0110:31:24~||
-
- //鏂囦欢澶�
- String toString="";
- if(XTBM.equals("5001")){
- toString=MKBM+";"+MKMC+";"+XTBM+";"+formatYMD.format(nowD)+"~";
- }else{
- toString=MKBM+";"+MKMC+";"+formatYMD.format(nowD)+"~";
- }
-
-
- DlShebeixxCdYcsj dlShebeixxCdYcsj=new DlShebeixxCdYcsj();
- dlShebeixxCdYcsj.setShiFouFS(0);//鏄惁鍙戦�� 0鏈彂閫� 1鍙戦��
- dlShebeixxCdYcsj.setXiTongBM(XTBM);//绯荤粺缂栫爜
- dlShebeixxCdYcsj.setWenJianFL(WJFL);//鏂囦欢鍒嗙被
- List<DlShebeixxCdYcsj> list = dlShebeixxCdYcsjService.selectDlShebeixxCdYcsjList(dlShebeixxCdYcsj);
-
- //鏂囦欢浣�
- for (int i = 0; i < list.size(); i++) {
- DlShebeixxCdYcsj dlShebeiYCSJ=list.get(i);
- String objString=dlShebeiYCSJ.getCeDianBM()+";" //娴嬬偣缂栫爜
- +dlShebeiYCSJ.getCeDianLXBM()+";" //娴嬬偣绫诲瀷缂栫爜
- +dlShebeiYCSJ.getCeDianLXMC()+";" //娴嬬偣绫诲瀷鍚嶇О
- +dlShebeiYCSJ.getSuoShuSBBM()+";" //鎵�灞炶澶囩紪鐮�
- +dlShebeiYCSJ.getYiChangLX()+";" //寮傚父绫诲瀷
- +formatYMD.format(dlShebeiYCSJ.getYiChangKSSJ())+";" //寮傚父寮�濮嬫椂闂�
- +formatYMD.format(dlShebeiYCSJ.getYiChangJSSJ())+";" //寮傚父缁撴潫鏃堕棿
- +dlShebeiYCSJ.getYiChangQJZDZ()+";" //寮傚父鏈熼棿鏈�澶у��
- +formatYMD.format(dlShebeiYCSJ.getZuiDaZSK())+";" //鏈�澶у�兼椂鍒�
- +dlShebeiYCSJ.getYiChangQJZXZ()+";" //寮傚父鏈熼棿鏈�灏忓��
- +formatYMD.format(dlShebeiYCSJ.getZuiXiaoZSK())+";" //鏈�灏忓�兼椂鍒�
- +dlShebeiYCSJ.getYiChangQJPJZ()+";" //寮傚父鏈熼棿骞冲潎鍊�
- +formatYMD.format(dlShebeiYCSJ.getShuJuSJ())+"~||"; //鏁版嵁鏃堕棿
-
- toString+=objString;
-
- //鏇存柊涓哄凡鍙戦��
- DlShebeixxCdYcsj dlShebeixxCdYcsjU=new DlShebeixxCdYcsj();
- dlShebeixxCdYcsjU.setId(dlShebeiYCSJ.getId());
- dlShebeixxCdYcsjU.setShiFouFS(1);
- dlShebeixxCdYcsjService.updateDlShebeixxCdYcsj(dlShebeixxCdYcsjU);
- }
-
- //鎵归噺鏇挎崲null瀛楃涓�
- toString = StringUtils.replace(toString, "null", "");
-
- String fileUrl=url + "/"+MKBM+"_"+WJFL+"_"+XTBM+"_"+format.format(nowD)+".txt";
- FileUtil.writeLogInFile(fileUrl,toString);
-
- JSONObject obj=new JSONObject();
- obj.put("type","寮傚父鏁版嵁");
- obj.put("url",fileUrl);
- obj.put("sendSum",0);
- obj.put("fileName",MKBM+"_"+WJFL+"_"+XTBM+"_"+format.format(nowD));
- redisCache.rightPush("DataAssemble",obj);
- }
-
- //璁板綍鍙戦�佹鏁�
- public static void DataTransmission(FtpUtils ftpUtil,JSONObject obj) throws InterruptedException {
- //閫氳繃ftp鏂瑰紡鍙戦��
- //鍙栧嚭鐨勬暟鎹�
- System.out.println("鐢靛姏涓婁紶寮�濮嬪彂閫佹暟鎹�:"+obj.toString());
-
- TbDataSendRecords tbDataSendRecords=new TbDataSendRecords();
- try{
- String url=obj.getString("url");
- String fileName=obj.getString("fileName");
-
- tbDataSendRecords.setFileName(fileName);//鏂囦欢鍚�
- tbDataSendRecords.setDataHeader("");//鏁版嵁澶�
- tbDataSendRecords.setDataNumber(1l);//鏁版嵁鏁伴噺
- tbDataSendRecords.setSendFileUrl(url);//鏂囦欢鍙戦�丗TP浣嶇疆
- tbDataSendRecords.setCoalMineId(1l);//鎵�灞炵叅鐭縄D
- tbDataSendRecords.setSystemId(1l);//鎵�灞炵郴缁烮D
- tbDataSendRecords.setRuleId(1l);//鏁版嵁鏂囦欢閲囬泦瑙勫垯ID
- tbDataSendRecords.setDetectionTime(new Date());//鏂囦欢澶勭悊鏃堕棿
- tbDataSendRecords.setDetectionResult("0");//鏄惁绯荤粺鐢熸垚鐨� 0鏄� 1鍚�
- tbDataSendRecords.setCheckResult("1");//鏍￠獙缁撴灉 0閫氳繃 1鏈�氳繃
-
- String[] split = fileName.split("_");
-
- String lj=split[1].substring(0,2);
-
- if(lj.equals("JB")){
- String ks=split[2].substring(0,2);
- if(ks.equals("61")){
- lj="TF";
- }else if(ks.equals("62")){
- lj="PS";
- }else if(ks.equals("63")){
- lj="ZY";
- }else if(ks.equals("64")){
- lj="TS";
- }
- }
-
- boolean storeFlag=ftpUtil.uploadFile(RuoYiConfig.getFtpPath()+"\\"+lj,"",fileName,url);
- if(storeFlag){
- tbDataSendRecords.setSendResult("0");//鍙戦�佺粨鏋� 0鎴愬姛 1澶辫触
- }else{
- tbDataSendRecords.setSendResult("1");//鍙戦�佺粨鏋� 0鎴愬姛 1澶辫触
- int sendSum=obj.getInteger("sendSum");
- int nowSendSum=sendSum+1;
- obj.put("sendSum",nowSendSum);
- redisCache.rightPush("DataAssemble",obj);
- Thread.sleep(1000);
- }
- //tbDataSendRecordsService.insertTbDataSendRecords(tbDataSendRecords);
- }catch (Exception e){
- System.err.println("FTP鍙戦�佸嚭鐜板紓甯�:::::"+e.getMessage());
- //濡傛灉鍑虹幇寮傚父闇�閲嶆柊缂撳瓨锛岄噸鏂拌繘琛屽彂閫�
-
- tbDataSendRecords.setSendResult("1");//鍙戦�佺粨鏋� 0鎴愬姛 1澶辫触
- int sendSum=obj.getInteger("sendSum");
- int nowSendSum=sendSum+1;
- obj.put("sendSum",nowSendSum);
- redisCache.rightPush("DataAssemble",obj);
- //tbDataSendRecordsService.insertTbDataSendRecords(tbDataSendRecords);
- Thread.sleep(1000);
- }
-
- }
-
-
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/task/SjcsDlTask.java b/ruoyi-admin/src/main/java/com/ruoyi/task/SjcsDlTask.java
index cf54db6..b64187b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/task/SjcsDlTask.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/task/SjcsDlTask.java
@@ -40,11 +40,6 @@
@Component("sjcsDlTask")
public class SjcsDlTask {
- //10绉掓墽琛屼竴娆�
- public void indexDlTask() {
- DataAssembleUtil.AssembleCDSSSJ();//瀹炴椂鏁版嵁
- DataAssembleUtil.AssembleCDYCSJ();//寮傚父鏁版嵁
- }
//5鍒嗛挓鎵ц涓�娆�
public void indexCameraTask() {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/utils/CameraUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/utils/CameraUtils.java
deleted file mode 100644
index 316d1e9..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/utils/CameraUtils.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package com.ruoyi.utils;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ruoyi.activeMQ.vo.CameraCon;
-import com.ruoyi.activeMQ.vo.CameraControlVO;
-import com.ruoyi.activeMQ.vo.CameraRuleVO;
-import com.ruoyi.activeMQ.vo.RuleAreaVO;
-import com.ruoyi.aibrain.domain.AiCamera;
-import com.ruoyi.aibrain.domain.AiCameraRule;
-import com.ruoyi.aibrain.domain.Point;
-import com.ruoyi.aibrain.service.IAiCameraService;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.Threads;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.config.ActiveManager;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.commons.lang3.ObjectUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cglib.beans.BeanCopier;
-
-import javax.jms.Destination;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class CameraUtils {
-
- private static final Logger logger = LoggerFactory.getLogger(Threads.class);
-
- private static BeanCopier copier = BeanCopier.create(AiCamera.class, CameraControlVO.class, false);
-
- @Autowired
- private static ActiveManager activeManager;
-
- @Autowired
- private static IAiCameraService aiCameraService;
-
- @Autowired
- private static RedisCache redisCache;
-
-
- /**
- * 鍚姩AI璇嗗埆璁惧
- */
- public static void startCamera() {
- startCameraAll("1");
-// activeManager = SpringUtils.getBean(ActiveManager.class);
-// aiCameraService = SpringUtils.getBean(IAiCameraService.class);
-//
-// Destination destination = new ActiveMQQueue("cameraControlQueue");//P2P妯″紡鍗曚釜娑堣垂鑰�
-// List<AiCamera> cameraList = aiCameraService.queryCameraToStart();
-// for (AiCamera camera : cameraList){
-// CameraControlVO cameraVO = new CameraControlVO();
-// copier.copy(camera,cameraVO,null);
-// cameraVO.setTime(new Date().getTime());
-//
-// List<CameraRuleVO> rules = new ArrayList<>();
-// for (AiCameraRule cameraRule : camera.getRules()){
-// CameraRuleVO ruleVO = new CameraRuleVO();
-// ruleVO.setrecordDuration(cameraRule.getrecordDuration());
-// ruleVO.setisRecord(cameraRule.getisRecord());
-// ruleVO.setCameraId(cameraRule.getCameraId());
-// ruleVO.setPeopleNumber(cameraRule.getPeopleNumber());
-// ruleVO.setRuleId(cameraRule.getRuleId());
-// ruleVO.setRuleName(cameraRule.getRuleName());
-// ruleVO.setRuleArea(cameraRule.getAreas());
-// rules.add(ruleVO);
-// }
-// cameraVO.setRules(rules);
-// camera.setRunStatus("1");
-// aiCameraService.updateAiCameraStatus(camera);
-// //浼犲叆闃熷垪浠ュ強鍊�
-// activeManager.send(destination, JSON.toJSONString(cameraVO));
-// logger.info("cameraControlQueue闃熷垪锛�"+JSON.toJSONString(cameraVO));
-// }
- }
-
-
-
- /**
- * 鍚姩AI璇嗗埆璁惧
- */
- public static void startCamera(long id,String runStatus) {
- activeManager = SpringUtils.getBean(ActiveManager.class);
- aiCameraService = SpringUtils.getBean(IAiCameraService.class);
- redisCache = SpringUtils.getBean(RedisCache.class);
-
-
- Destination destination = new ActiveMQQueue("cameraControlQueue");//P2P妯″紡鍗曚釜娑堣垂鑰�
- AiCamera camera = aiCameraService.selectAiCameraById(id);
- CameraCon cameraCon=new CameraCon();
- cameraCon.setState(Integer.valueOf(runStatus));
-
-
- List<CameraControlVO> cameraControlVOS=new ArrayList<>();
-
- CameraControlVO cameraVO = new CameraControlVO();
- cameraVO.setId(String.valueOf(camera.getId()));
- cameraVO.setRtspUrl(camera.getRtspUrl());
- cameraVO.setIp(camera.getCameraIp());
- cameraVO.setName(camera.getName());
- cameraVO.setRemp_h(camera.getRempH());
- cameraVO.setRemp_w(camera.getRempW());
- if(ObjectUtils.isNotEmpty(camera.getLeatherWidth())){
- cameraVO.setBeltWidth(String.valueOf(camera.getLeatherWidth()));//鐨甫瀹藉害
- }
- if(ObjectUtils.isNotEmpty(camera.getToRtmp())){
- cameraVO.setToRtmp(camera.getToRtmp());
- }
- List<CameraRuleVO> rules = new ArrayList<>();
- for (AiCameraRule cameraRule : camera.getRules()){
- CameraRuleVO ruleVO = new CameraRuleVO();
- ruleVO.setId(String.valueOf(cameraRule.getRuleId()));
- if(ObjectUtils.isNotEmpty(cameraRule.getSecond())){
- ruleVO.setDelay(cameraRule.getSecond());//寤舵椂鏃堕棿鏁�
- }
- if(ObjectUtils.isNotEmpty(cameraRule.getThreshold())){
- ruleVO.setThreshold(cameraRule.getThreshold());//闃堝��
- }
- if(cameraRule.getIsRecord().equals("1")){
- ruleVO.setIsRecord(cameraRule.getIsRecord());//鏄惁褰曞儚
- ruleVO.setRecordDuration(cameraRule.getRecordDuration());//褰曞儚鏃堕暱
- }else{
- ruleVO.setIsRecord(cameraRule.getIsRecord());//鏄惁褰曞儚
- }
- RuleAreaVO ruleAreaVO=new RuleAreaVO();
- ruleAreaVO.setB(cameraRule.getB());
- ruleAreaVO.setG(cameraRule.getG());
- ruleAreaVO.setR(cameraRule.getR());
- if(ObjectUtils.isNotEmpty(cameraRule.getPic_w())){
- ruleAreaVO.setPic_w(cameraRule.getPic_w());
- }
- if(ObjectUtils.isNotEmpty(cameraRule.getPic_h())){
- ruleAreaVO.setPic_h(cameraRule.getPic_h());
- }
- if(ObjectUtils.isNotEmpty(cameraRule.getRuleArea())){
- List<Point> objects = JSON.parseArray(cameraRule.getRuleArea(),Point.class);
- ruleAreaVO.setPoints(objects);
- }
- ruleVO.setRects(ruleAreaVO);
- rules.add(ruleVO);
- }
- cameraVO.setModels(rules);
- cameraControlVOS.add(cameraVO);
- cameraCon.setCameras(cameraControlVOS);
-
- //鏇存柊鎽勫儚澶村惎鍔ㄧ姸鎬�
- camera.setStatus(runStatus);
- aiCameraService.updateAiCameraStatus(camera);
- //浼犲叆闃熷垪浠ュ強鍊�
- activeManager.send(destination, JSON.toJSONString(cameraCon).replace("\\", ""));
- logger.info("cameraControlQueue闃熷垪锛�"+JSON.toJSONString(cameraCon));
- }
-
- /**
- * 鎵归噺鍚姩璁惧
- */
- public static void startCameraAll(String runStatus) {
- activeManager = SpringUtils.getBean(ActiveManager.class);
- aiCameraService = SpringUtils.getBean(IAiCameraService.class);
- redisCache = SpringUtils.getBean(RedisCache.class);
-
-
- Destination destination = new ActiveMQQueue("cameraControlQueue");//P2P妯″紡鍗曚釜娑堣垂鑰�
- List<AiCamera> list = aiCameraService.selectAllCamera();
- redisCache.setCacheObject("AI::AiCameraList",list);
-
-
-
- CameraCon cameraCon=new CameraCon();
- List<CameraControlVO> cameraControlVOS=new ArrayList<>();
- for (AiCamera camera : list) {
- redisCache.setCacheObject("AI::AiCameraObj"+camera.getCameraNum(),camera);
- cameraCon.setState(Integer.valueOf(runStatus));
- CameraControlVO cameraVO = new CameraControlVO();
- cameraVO.setId(String.valueOf(camera.getId()));
- cameraVO.setRtspUrl(camera.getRtspUrl());
- cameraVO.setIp(camera.getCameraIp());
- cameraVO.setName(camera.getName());
- cameraVO.setRemp_h(camera.getRempH());
- cameraVO.setRemp_w(camera.getRempW());
- if(ObjectUtils.isNotEmpty(camera.getLeatherWidth())){
- cameraVO.setBeltWidth(String.valueOf(camera.getLeatherWidth()));//鐨甫瀹藉害
- }
- if(ObjectUtils.isNotEmpty(camera.getToRtmp())){
- cameraVO.setToRtmp(camera.getToRtmp());
- }
- List<CameraRuleVO> rules = new ArrayList<>();
- for (AiCameraRule cameraRule : camera.getRules()){
- CameraRuleVO ruleVO = new CameraRuleVO();
- ruleVO.setId(String.valueOf(cameraRule.getRuleId()));
- if(ObjectUtils.isNotEmpty(cameraRule.getSecond())){
- ruleVO.setDelay(cameraRule.getSecond());//寤舵椂鏃堕棿鏁�
- }
- if(ObjectUtils.isNotEmpty(cameraRule.getThreshold())){
- ruleVO.setThreshold(cameraRule.getThreshold());//闃堝��
- }
- RuleAreaVO ruleAreaVO=new RuleAreaVO();
- ruleAreaVO.setB(cameraRule.getB());
- ruleAreaVO.setG(cameraRule.getG());
- ruleAreaVO.setR(cameraRule.getR());
- if(ObjectUtils.isNotEmpty(cameraRule.getPic_w())){
- ruleAreaVO.setPic_w(cameraRule.getPic_w());
- }
- if(ObjectUtils.isNotEmpty(cameraRule.getPic_h())){
- ruleAreaVO.setPic_h(cameraRule.getPic_h());
- }
- if(ObjectUtils.isNotEmpty(cameraRule.getRuleArea())){
- List<Point> objects = JSON.parseArray(cameraRule.getRuleArea(),Point.class);
- ruleAreaVO.setPoints(objects);
- }
- ruleVO.setRects(ruleAreaVO);
- rules.add(ruleVO);
- }
- cameraVO.setModels(rules);
- cameraControlVOS.add(cameraVO);
- cameraCon.setCameras(cameraControlVOS);
-
- //鏇存柊鎽勫儚澶村惎鍔ㄧ姸鎬�
- camera.setStatus(runStatus);
- aiCameraService.updateAiCameraStatus(camera);
- }
-
-
-
- //浼犲叆闃熷垪浠ュ強鍊�
- activeManager.send(destination, JSON.toJSONString(cameraCon).replace("\\", ""));
- logger.info("cameraControlQueue闃熷垪锛�"+JSON.toJSONString(cameraCon));
- }
-}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index f2877b0..7b526e3 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -119,15 +119,3 @@
max-active: 8
# #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
max-wait: -1ms
-
- activemq:
- # MQ鎵�鍦ㄧ殑鏈嶅姟鍣ㄧ殑鍦板潃
- broker-url: tcp://192.168.1.11:61616
- # 鏄惁浣跨敤鍐呯疆鐨凪Q锛� true 浣跨敤锛� fale 涓嶄娇鐢�
- in-memory: false
- # 鏄惁鍦ㄥ洖婊氬洖婊氭秷鎭箣鍓嶅仠姝㈡秷鎭紶閫掋�傝繖鎰忓懗鐫�褰撳惎鐢ㄦ鍛戒护鏃讹紝娑堟伅椤哄簭涓嶄細琚繚鐣欍��
- non-blocking-redelivery: false
- # 鐢ㄦ埛鍚�
- password: admin
- # 瀵嗙爜
- user: admin
diff --git a/ruoyi-admin/src/main/resources/application-one.yml b/ruoyi-admin/src/main/resources/application-one.yml
index a578a66..b765c11 100644
--- a/ruoyi-admin/src/main/resources/application-one.yml
+++ b/ruoyi-admin/src/main/resources/application-one.yml
@@ -41,7 +41,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://192.168.20.18:3306/fzjk_mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.20.18:3306/yc_ai_mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
# password: 123456
password: kem12345..
@@ -117,15 +117,3 @@
max-active: 8
# #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
max-wait: -1ms
-
- activemq:
- # MQ鎵�鍦ㄧ殑鏈嶅姟鍣ㄧ殑鍦板潃
- broker-url: tcp://192.168.20.24:61616
- # 鏄惁浣跨敤鍐呯疆鐨凪Q锛� true 浣跨敤锛� fale 涓嶄娇鐢�
- in-memory: false
- # 鏄惁鍦ㄥ洖婊氬洖婊氭秷鎭箣鍓嶅仠姝㈡秷鎭紶閫掋�傝繖鎰忓懗鐫�褰撳惎鐢ㄦ鍛戒护鏃讹紝娑堟伅椤哄簭涓嶄細琚繚鐣欍��
- non-blocking-redelivery: false
- # 鐢ㄦ埛鍚�
- password: admin
- # 瀵嗙爜
- user: admin
diff --git a/ruoyi-admin/src/main/resources/application-two.yml b/ruoyi-admin/src/main/resources/application-two.yml
index 53fee81..793059e 100644
--- a/ruoyi-admin/src/main/resources/application-two.yml
+++ b/ruoyi-admin/src/main/resources/application-two.yml
@@ -41,7 +41,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://192.168.30.18:3306/fzjk_mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.30.18:3306/yc_ai_mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
# password: 123456
password: kem12345..
@@ -117,15 +117,3 @@
max-active: 8
# #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
max-wait: -1ms
-
- activemq:
- # MQ鎵�鍦ㄧ殑鏈嶅姟鍣ㄧ殑鍦板潃
- broker-url: tcp://192.168.30.24:61616
- # 鏄惁浣跨敤鍐呯疆鐨凪Q锛� true 浣跨敤锛� fale 涓嶄娇鐢�
- in-memory: false
- # 鏄惁鍦ㄥ洖婊氬洖婊氭秷鎭箣鍓嶅仠姝㈡秷鎭紶閫掋�傝繖鎰忓懗鐫�褰撳惎鐢ㄦ鍛戒护鏃讹紝娑堟伅椤哄簭涓嶄細琚繚鐣欍��
- non-blocking-redelivery: false
- # 鐢ㄦ埛鍚�
- password: admin
- # 瀵嗙爜
- user: admin
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 5e9a20f..b4e639a 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -40,7 +40,7 @@
#涓�鐭� one
#浜岀熆 two
profiles:
- active: one
+ active: two
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdMapper.xml b/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdMapper.xml
deleted file mode 100644
index 8cab8cd..0000000
--- a/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdMapper.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.dl.mapper.DlShebeixxCdMapper">
-
- <resultMap type="DlShebeixxCd" id="DlShebeixxCdResult">
- <result property="id" column="id" />
- <result property="ceDianBM" column="ceDianBM" />
- <result property="ceDianLXBM" column="ceDianLXBM" />
- <result property="ceDianLXMC" column="ceDianLXMC" />
- <result property="suoShuSBBM" column="suoShuSBBM" />
- <result property="ceDianWZ" column="ceDianWZ" />
- <result property="ceLiangZDW" column="ceLiangZDW" />
- <result property="liangChenSX" column="liangChenSX" />
- <result property="liangChenXX" column="liangChenXX" />
- <result property="biaoJingSX" column="biaoJingSX" />
- <result property="biaoJingXX" column="biaoJingXX" />
- <result property="chuanGanQGLGX" column="chuanGanQGLGX" />
- <result property="shuJuDYSJ" column="shuJuDYSJ" />
- <result property="xiTongBM" column="xiTongBM" />
- <result property="wenJianFL" column="wenJianFL" />
- </resultMap>
-
- <sql id="selectDlShebeixxCdVo">
- select id, ceDianBM, ceDianLXBM, ceDianLXMC,xiTongBM,wenJianFL, suoShuSBBM, ceDianWZ, ceLiangZDW, liangChenSX, liangChenXX, biaoJingSX, biaoJingXX, chuanGanQGLGX, shuJuDYSJ from dl_shebeixx_cd
- </sql>
-
- <select id="selectDlShebeixxCdList" parameterType="DlShebeixxCd" resultMap="DlShebeixxCdResult">
- <include refid="selectDlShebeixxCdVo"/>
- <where>
- <if test="ceDianBM != null and ceDianBM != ''"> and ceDianBM = #{ceDianBM}</if>
- <if test="ceDianLXBM != null and ceDianLXBM != ''"> and ceDianLXBM = #{ceDianLXBM}</if>
- <if test="ceDianLXMC != null and ceDianLXMC != ''"> and ceDianLXMC = #{ceDianLXMC}</if>
- <if test="suoShuSBBM != null and suoShuSBBM != ''"> and suoShuSBBM = #{suoShuSBBM}</if>
- <if test="ceDianWZ != null and ceDianWZ != ''"> and ceDianWZ = #{ceDianWZ}</if>
- <if test="ceLiangZDW != null and ceLiangZDW != ''"> and ceLiangZDW = #{ceLiangZDW}</if>
- <if test="liangChenSX != null and liangChenSX != ''"> and liangChenSX = #{liangChenSX}</if>
- <if test="liangChenXX != null and liangChenXX != ''"> and liangChenXX = #{liangChenXX}</if>
- <if test="biaoJingSX != null and biaoJingSX != ''"> and biaoJingSX = #{biaoJingSX}</if>
- <if test="biaoJingXX != null and biaoJingXX != ''"> and biaoJingXX = #{biaoJingXX}</if>
- <if test="chuanGanQGLGX != null and chuanGanQGLGX != ''"> and chuanGanQGLGX = #{chuanGanQGLGX}</if>
- <if test="shuJuDYSJ != null "> and shuJuDYSJ = #{shuJuDYSJ}</if>
- <if test="xiTongBM != null "> and xiTongBM = #{xiTongBM}</if>
- <if test="wenJianFL != null "> and wenJianFL = #{wenJianFL}</if>
- </where>
- </select>
-
- <select id="selectListByGroupBy" parameterType="DlShebeixxCd" resultMap="DlShebeixxCdResult">
- select xiTongBM,wenJianFL from dl_shebeixx_cd where xiTongBM is not null and wenJianFL is not null GROUP BY xiTongBM,wenJianFL
- </select>
-
- <select id="selectDlShebeixxCdById" parameterType="Long" resultMap="DlShebeixxCdResult">
- <include refid="selectDlShebeixxCdVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertDlShebeixxCd" parameterType="DlShebeixxCd" useGeneratedKeys="true" keyProperty="id">
- insert into dl_shebeixx_cd
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ceDianBM != null">ceDianBM,</if>
- <if test="ceDianLXBM != null">ceDianLXBM,</if>
- <if test="ceDianLXMC != null">ceDianLXMC,</if>
- <if test="suoShuSBBM != null">suoShuSBBM,</if>
- <if test="ceDianWZ != null">ceDianWZ,</if>
- <if test="ceLiangZDW != null">ceLiangZDW,</if>
- <if test="liangChenSX != null">liangChenSX,</if>
- <if test="liangChenXX != null">liangChenXX,</if>
- <if test="biaoJingSX != null">biaoJingSX,</if>
- <if test="biaoJingXX != null">biaoJingXX,</if>
- <if test="chuanGanQGLGX != null">chuanGanQGLGX,</if>
- <if test="shuJuDYSJ != null">shuJuDYSJ,</if>
- <if test="xiTongBM != null">xiTongBM,</if>
- <if test="wenJianFL != null">wenJianFL,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ceDianBM != null">#{ceDianBM},</if>
- <if test="ceDianLXBM != null">#{ceDianLXBM},</if>
- <if test="ceDianLXMC != null">#{ceDianLXMC},</if>
- <if test="suoShuSBBM != null">#{suoShuSBBM},</if>
- <if test="ceDianWZ != null">#{ceDianWZ},</if>
- <if test="ceLiangZDW != null">#{ceLiangZDW},</if>
- <if test="liangChenSX != null">#{liangChenSX},</if>
- <if test="liangChenXX != null">#{liangChenXX},</if>
- <if test="biaoJingSX != null">#{biaoJingSX},</if>
- <if test="biaoJingXX != null">#{biaoJingXX},</if>
- <if test="chuanGanQGLGX != null">#{chuanGanQGLGX},</if>
- <if test="shuJuDYSJ != null">#{shuJuDYSJ},</if>
- <if test="xiTongBM != null">#{xiTongBM},</if>
- <if test="wenJianFL != null">#{wenJianFL},</if>
- </trim>
- </insert>
-
- <update id="updateDlShebeixxCd" parameterType="DlShebeixxCd">
- update dl_shebeixx_cd
- <trim prefix="SET" suffixOverrides=",">
- <if test="ceDianBM != null">ceDianBM = #{ceDianBM},</if>
- <if test="ceDianLXBM != null">ceDianLXBM = #{ceDianLXBM},</if>
- <if test="ceDianLXMC != null">ceDianLXMC = #{ceDianLXMC},</if>
- <if test="suoShuSBBM != null">suoShuSBBM = #{suoShuSBBM},</if>
- <if test="ceDianWZ != null">ceDianWZ = #{ceDianWZ},</if>
- <if test="ceLiangZDW != null">ceLiangZDW = #{ceLiangZDW},</if>
- <if test="liangChenSX != null">liangChenSX = #{liangChenSX},</if>
- <if test="liangChenXX != null">liangChenXX = #{liangChenXX},</if>
- <if test="biaoJingSX != null">biaoJingSX = #{biaoJingSX},</if>
- <if test="biaoJingXX != null">biaoJingXX = #{biaoJingXX},</if>
- <if test="chuanGanQGLGX != null">chuanGanQGLGX = #{chuanGanQGLGX},</if>
- <if test="shuJuDYSJ != null">shuJuDYSJ = #{shuJuDYSJ},</if>
- <if test="xiTongBM != null">xiTongBM = #{xiTongBM},</if>
- <if test="wenJianFL != null">wenJianFL = #{wenJianFL},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteDlShebeixxCdById" parameterType="Long">
- delete from dl_shebeixx_cd where id = #{id}
- </delete>
-
- <delete id="deleteDlShebeixxCdByIds" parameterType="String">
- delete from dl_shebeixx_cd where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdSssjMapper.xml b/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdSssjMapper.xml
deleted file mode 100644
index cd0604c..0000000
--- a/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdSssjMapper.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.dl.mapper.DlShebeixxCdSssjMapper">
-
- <resultMap type="DlShebeixxCdSssj" id="DlShebeixxCdSssjResult">
- <result property="id" column="id" />
- <result property="ceDianBM" column="ceDianBM" />
- <result property="ceDianLXBM" column="ceDianLXBM" />
- <result property="ceDianLXMC" column="ceDianLXMC" />
- <result property="suoShuSBBM" column="suoShuSBBM" />
- <result property="ceDianSZ" column="ceDianSZ" />
- <result property="ceDianSZDW" column="ceDianSZDW" />
- <result property="ceDianZT" column="ceDianZT" />
- <result property="shuJuSJ" column="shuJuSJ" />
- <result property="xiTongBM" column="xiTongBM" />
- <result property="wenJianFL" column="wenJianFL" />
- </resultMap>
-
- <sql id="selectDlShebeixxCdSssjVo">
- select id, ceDianBM, ceDianLXBM, ceDianLXMC,xiTongBM,wenJianFL, suoShuSBBM, ceDianSZ, ceDianSZDW, ceDianZT, shuJuSJ from dl_shebeixx_cd_sssj
- </sql>
-
- <select id="selectDlShebeixxCdSssjList" parameterType="DlShebeixxCdSssj" resultMap="DlShebeixxCdSssjResult">
- <include refid="selectDlShebeixxCdSssjVo"/>
- <where>
- <if test="ceDianBM != null and ceDianBM != ''"> and ceDianBM = #{ceDianBM}</if>
- <if test="ceDianLXBM != null and ceDianLXBM != ''"> and ceDianLXBM = #{ceDianLXBM}</if>
- <if test="ceDianLXMC != null and ceDianLXMC != ''"> and ceDianLXMC = #{ceDianLXMC}</if>
- <if test="suoShuSBBM != null and suoShuSBBM != ''"> and suoShuSBBM = #{suoShuSBBM}</if>
- <if test="ceDianSZ != null and ceDianSZ != ''"> and ceDianSZ = #{ceDianSZ}</if>
- <if test="ceDianSZDW != null and ceDianSZDW != ''"> and ceDianSZDW = #{ceDianSZDW}</if>
- <if test="ceDianZT != null and ceDianZT != ''"> and ceDianZT = #{ceDianZT}</if>
- <if test="shuJuSJ != null "> and shuJuSJ = #{shuJuSJ}</if>
- <if test="xiTongBM != null "> and xiTongBM = #{xiTongBM}</if>
- <if test="wenJianFL != null "> and wenJianFL = #{wenJianFL}</if>
- </where>
- </select>
-
- <select id="selectListByGroupBy" parameterType="DlShebeixxCdSssj" resultMap="DlShebeixxCdSssjResult">
- select xiTongBM,wenJianFL from dl_shebeixx_cd_sssj where xiTongBM is not null and wenJianFL is not null GROUP BY xiTongBM,wenJianFL
- </select>
-
- <select id="selectDlShebeixxCdSssjById" parameterType="Long" resultMap="DlShebeixxCdSssjResult">
- <include refid="selectDlShebeixxCdSssjVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertDlShebeixxCdSssj" parameterType="DlShebeixxCdSssj" useGeneratedKeys="true" keyProperty="id">
- insert into dl_shebeixx_cd_sssj
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ceDianBM != null">ceDianBM,</if>
- <if test="ceDianLXBM != null">ceDianLXBM,</if>
- <if test="ceDianLXMC != null">ceDianLXMC,</if>
- <if test="suoShuSBBM != null">suoShuSBBM,</if>
- <if test="ceDianSZ != null">ceDianSZ,</if>
- <if test="ceDianSZDW != null">ceDianSZDW,</if>
- <if test="ceDianZT != null">ceDianZT,</if>
- <if test="shuJuSJ != null">shuJuSJ,</if>
- <if test="xiTongBM != null">xiTongBM,</if>
- <if test="wenJianFL != null">wenJianFL,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ceDianBM != null">#{ceDianBM},</if>
- <if test="ceDianLXBM != null">#{ceDianLXBM},</if>
- <if test="ceDianLXMC != null">#{ceDianLXMC},</if>
- <if test="suoShuSBBM != null">#{suoShuSBBM},</if>
- <if test="ceDianSZ != null">#{ceDianSZ},</if>
- <if test="ceDianSZDW != null">#{ceDianSZDW},</if>
- <if test="ceDianZT != null">#{ceDianZT},</if>
- <if test="shuJuSJ != null">#{shuJuSJ},</if>
- <if test="xiTongBM != null">#{xiTongBM},</if>
- <if test="wenJianFL != null">#{wenJianFL},</if>
- </trim>
- </insert>
-
- <update id="updateDlShebeixxCdSssj" parameterType="DlShebeixxCdSssj">
- update dl_shebeixx_cd_sssj
- <trim prefix="SET" suffixOverrides=",">
- <if test="ceDianBM != null">ceDianBM = #{ceDianBM},</if>
- <if test="ceDianLXBM != null">ceDianLXBM = #{ceDianLXBM},</if>
- <if test="ceDianLXMC != null">ceDianLXMC = #{ceDianLXMC},</if>
- <if test="suoShuSBBM != null">suoShuSBBM = #{suoShuSBBM},</if>
- <if test="ceDianSZ != null">ceDianSZ = #{ceDianSZ},</if>
- <if test="ceDianSZDW != null">ceDianSZDW = #{ceDianSZDW},</if>
- <if test="ceDianZT != null">ceDianZT = #{ceDianZT},</if>
- <if test="shuJuSJ != null">shuJuSJ = #{shuJuSJ},</if>
- <if test="xiTongBM != null">xiTongBM = #{xiTongBM},</if>
- <if test="wenJianFL != null">wenJianFL = #{wenJianFL},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteDlShebeixxCdSssjById" parameterType="Long">
- delete from dl_shebeixx_cd_sssj where id = #{id}
- </delete>
-
- <delete id="deleteDlShebeixxCdSssjByIds" parameterType="String">
- delete from dl_shebeixx_cd_sssj where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdYcsjMapper.xml b/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdYcsjMapper.xml
deleted file mode 100644
index a8e885e..0000000
--- a/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdYcsjMapper.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.dl.mapper.DlShebeixxCdYcsjMapper">
-
- <resultMap type="DlShebeixxCdYcsj" id="DlShebeixxCdYcsjResult">
- <result property="id" column="id" />
- <result property="ceDianBM" column="ceDianBM" />
- <result property="ceDianLXBM" column="ceDianLXBM" />
- <result property="ceDianLXMC" column="ceDianLXMC" />
- <result property="suoShuSBBM" column="suoShuSBBM" />
- <result property="yiChangLX" column="yiChangLX" />
- <result property="yiChangKSSJ" column="yiChangKSSJ" />
- <result property="yiChangJSSJ" column="yiChangJSSJ" />
- <result property="yiChangQJZDZ" column="yiChangQJZDZ" />
- <result property="zuiDaZSK" column="zuiDaZSK" />
- <result property="yiChangQJZXZ" column="yiChangQJZXZ" />
- <result property="zuiXiaoZSK" column="zuiXiaoZSK" />
- <result property="yiChangQJPJZ" column="yiChangQJPJZ" />
- <result property="shuJuSJ" column="shuJuSJ" />
- <result property="yiChangSJZH" column="yiChangSJZH" />
- <result property="yiChangSJSL" column="yiChangSJSL" />
- <result property="shiFouFS" column="shiFouFS" />
- <result property="xiTongBM" column="xiTongBM" />
- <result property="wenJianFL" column="wenJianFL" />
- </resultMap>
-
- <sql id="selectDlShebeixxCdYcsjVo">
- select id, ceDianBM, ceDianLXBM, ceDianLXMC,xiTongBM,wenJianFL, suoShuSBBM, yiChangLX, yiChangKSSJ, yiChangJSSJ, yiChangQJZDZ, zuiDaZSK, yiChangQJZXZ, zuiXiaoZSK, yiChangQJPJZ, shuJuSJ, yiChangSJZH, yiChangSJSL,shiFouFS from dl_shebeixx_cd_ycsj
- </sql>
-
- <select id="selectDlShebeixxCdYcsjList" parameterType="DlShebeixxCdYcsj" resultMap="DlShebeixxCdYcsjResult">
- <include refid="selectDlShebeixxCdYcsjVo"/>
- <where>
- <if test="ceDianBM != null and ceDianBM != ''"> and ceDianBM = #{ceDianBM}</if>
- <if test="ceDianLXBM != null and ceDianLXBM != ''"> and ceDianLXBM = #{ceDianLXBM}</if>
- <if test="ceDianLXMC != null and ceDianLXMC != ''"> and ceDianLXMC = #{ceDianLXMC}</if>
- <if test="suoShuSBBM != null and suoShuSBBM != ''"> and suoShuSBBM = #{suoShuSBBM}</if>
- <if test="yiChangLX != null and yiChangLX != ''"> and yiChangLX = #{yiChangLX}</if>
- <if test="yiChangKSSJ != null "> and yiChangKSSJ = #{yiChangKSSJ}</if>
- <if test="yiChangJSSJ != null "> and yiChangJSSJ = #{yiChangJSSJ}</if>
- <if test="yiChangQJZDZ != null and yiChangQJZDZ != ''"> and yiChangQJZDZ = #{yiChangQJZDZ}</if>
- <if test="zuiDaZSK != null "> and zuiDaZSK = #{zuiDaZSK}</if>
- <if test="yiChangQJZXZ != null and yiChangQJZXZ != ''"> and yiChangQJZXZ = #{yiChangQJZXZ}</if>
- <if test="zuiXiaoZSK != null "> and zuiXiaoZSK = #{zuiXiaoZSK}</if>
- <if test="yiChangQJPJZ != null and yiChangQJPJZ != ''"> and yiChangQJPJZ = #{yiChangQJPJZ}</if>
- <if test="shuJuSJ != null "> and shuJuSJ = #{shuJuSJ}</if>
- <if test="yiChangSJZH != null "> and yiChangSJZH = #{yiChangSJZH}</if>
- <if test="yiChangSJSL != null "> and yiChangSJSL = #{yiChangSJSL}</if>
- <if test="shiFouFS != null "> and shiFouFS = #{shiFouFS} and yiChangJSSJ is not null </if>
- <if test="xiTongBM != null "> and xiTongBM = #{xiTongBM}</if>
- <if test="wenJianFL != null "> and wenJianFL = #{wenJianFL}</if>
- </where>
- </select>
-
- <select id="selectListByGroupBy" parameterType="DlShebeixxCdYcsj" resultMap="DlShebeixxCdYcsjResult">
- select xiTongBM,wenJianFL from dl_shebeixx_cd_ycsj where xiTongBM is not null and wenJianFL is not null and shiFouFS = 0 and yiChangJSSJ is not null GROUP BY xiTongBM,wenJianFL
- </select>
-
- <select id="selectDlShebeixxCdYcsjById" parameterType="Long" resultMap="DlShebeixxCdYcsjResult">
- <include refid="selectDlShebeixxCdYcsjVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertDlShebeixxCdYcsj" parameterType="DlShebeixxCdYcsj" useGeneratedKeys="true" keyProperty="id">
- insert into dl_shebeixx_cd_ycsj
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ceDianBM != null">ceDianBM,</if>
- <if test="ceDianLXBM != null">ceDianLXBM,</if>
- <if test="ceDianLXMC != null">ceDianLXMC,</if>
- <if test="suoShuSBBM != null">suoShuSBBM,</if>
- <if test="yiChangLX != null">yiChangLX,</if>
- <if test="yiChangKSSJ != null">yiChangKSSJ,</if>
- <if test="yiChangJSSJ != null">yiChangJSSJ,</if>
- <if test="yiChangQJZDZ != null">yiChangQJZDZ,</if>
- <if test="zuiDaZSK != null">zuiDaZSK,</if>
- <if test="yiChangQJZXZ != null">yiChangQJZXZ,</if>
- <if test="zuiXiaoZSK != null">zuiXiaoZSK,</if>
- <if test="yiChangQJPJZ != null">yiChangQJPJZ,</if>
- <if test="shuJuSJ != null">shuJuSJ,</if>
- <if test="yiChangSJZH != null">yiChangSJZH,</if>
- <if test="yiChangSJSL != null">yiChangSJSL,</if>
- <if test="shiFouFS != null">shiFouFS,</if>
- <if test="xiTongBM != null">xiTongBM,</if>
- <if test="wenJianFL != null">wenJianFL,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ceDianBM != null">#{ceDianBM},</if>
- <if test="ceDianLXBM != null">#{ceDianLXBM},</if>
- <if test="ceDianLXMC != null">#{ceDianLXMC},</if>
- <if test="suoShuSBBM != null">#{suoShuSBBM},</if>
- <if test="yiChangLX != null">#{yiChangLX},</if>
- <if test="yiChangKSSJ != null">#{yiChangKSSJ},</if>
- <if test="yiChangJSSJ != null">#{yiChangJSSJ},</if>
- <if test="yiChangQJZDZ != null">#{yiChangQJZDZ},</if>
- <if test="zuiDaZSK != null">#{zuiDaZSK},</if>
- <if test="yiChangQJZXZ != null">#{yiChangQJZXZ},</if>
- <if test="zuiXiaoZSK != null">#{zuiXiaoZSK},</if>
- <if test="yiChangQJPJZ != null">#{yiChangQJPJZ},</if>
- <if test="shuJuSJ != null">#{shuJuSJ},</if>
- <if test="yiChangSJZH != null">#{yiChangSJZH},</if>
- <if test="yiChangSJSL != null">#{yiChangSJSL},</if>
- <if test="shiFouFS != null">#{shiFouFS},</if>
- <if test="xiTongBM != null">#{xiTongBM},</if>
- <if test="wenJianFL != null">#{wenJianFL},</if>
- </trim>
- </insert>
-
- <update id="updateDlShebeixxCdYcsj" parameterType="DlShebeixxCdYcsj">
- update dl_shebeixx_cd_ycsj
- <trim prefix="SET" suffixOverrides=",">
- <if test="ceDianBM != null">ceDianBM = #{ceDianBM},</if>
- <if test="ceDianLXBM != null">ceDianLXBM = #{ceDianLXBM},</if>
- <if test="ceDianLXMC != null">ceDianLXMC = #{ceDianLXMC},</if>
- <if test="suoShuSBBM != null">suoShuSBBM = #{suoShuSBBM},</if>
- <if test="yiChangLX != null">yiChangLX = #{yiChangLX},</if>
- <if test="yiChangKSSJ != null">yiChangKSSJ = #{yiChangKSSJ},</if>
- <if test="yiChangJSSJ != null">yiChangJSSJ = #{yiChangJSSJ},</if>
- <if test="yiChangQJZDZ != null">yiChangQJZDZ = #{yiChangQJZDZ},</if>
- <if test="zuiDaZSK != null">zuiDaZSK = #{zuiDaZSK},</if>
- <if test="yiChangQJZXZ != null">yiChangQJZXZ = #{yiChangQJZXZ},</if>
- <if test="zuiXiaoZSK != null">zuiXiaoZSK = #{zuiXiaoZSK},</if>
- <if test="yiChangQJPJZ != null">yiChangQJPJZ = #{yiChangQJPJZ},</if>
- <if test="shuJuSJ != null">shuJuSJ = #{shuJuSJ},</if>
- <if test="yiChangSJZH != null">yiChangSJZH = #{yiChangSJZH},</if>
- <if test="yiChangSJSL != null">yiChangSJSL = #{yiChangSJSL},</if>
- <if test="shiFouFS != null">shiFouFS = #{shiFouFS},</if>
- <if test="xiTongBM != null">xiTongBM = #{xiTongBM},</if>
- <if test="wenJianFL != null">wenJianFL = #{wenJianFL},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteDlShebeixxCdYcsjById" parameterType="Long">
- delete from dl_shebeixx_cd_ycsj where id = #{id}
- </delete>
-
- <delete id="deleteDlShebeixxCdYcsjByIds" parameterType="String">
- delete from dl_shebeixx_cd_ycsj where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxMapper.xml b/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxMapper.xml
deleted file mode 100644
index 64fe6a7..0000000
--- a/ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxMapper.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.dl.mapper.DlShebeixxMapper">
-
- <resultMap type="DlShebeixx" id="DlShebeixxResult">
- <result property="id" column="id" />
- <result property="kuangDuanSBLX" column="kuangDuanSBLX" />
- <result property="kuangDuanSBLXMC" column="kuangDuanSBLXMC" />
- <result property="sheBeiBM" column="sheBeiBM" />
- <result property="sheBeiMC" column="sheBeiMC" />
- <result property="guiGeXH" column="guiGeXH" />
- <result property="sheBeiLX" column="sheBeiLX" />
- <result property="shengChanRQ" column="shengChanRQ" />
- <result property="suoShuXT" column="suoShuXT" />
- <result property="anZhuangRQ" column="anZhuangRQ" />
- <result property="anZhuangWZ" column="anZhuangWZ" />
- <result property="shengChanCJ" column="shengChanCJ" />
- <result property="chuChangBM" column="chuChangBM" />
- <result property="anBIaoZSBH" column="anBIaoZSBH" />
- <result property="fangBaoZSBH" column="fangBaoZSBH" />
- <result property="eDingDY" column="eDingDY" />
- <result property="eDingDL" column="eDingDL" />
- <result property="eDingGL" column="eDingGL" />
- <result property="xiTongBM" column="xiTongBM" />
- <result property="wenJianFL" column="wenJianFL" />
- </resultMap>
-
- <sql id="selectDlShebeixxVo">
- select id, kuangDuanSBLX, kuangDuanSBLXMC,xiTongBM,wenJianFL, sheBeiBM, sheBeiMC, guiGeXH, sheBeiLX, shengChanRQ, suoShuXT, anZhuangRQ, anZhuangWZ, shengChanCJ, chuChangBM, anBIaoZSBH, fangBaoZSBH, eDingDY, eDingDL, eDingGL from dl_shebeixx
- </sql>
-
- <select id="selectDlShebeixxList" parameterType="DlShebeixx" resultMap="DlShebeixxResult">
- <include refid="selectDlShebeixxVo"/>
- <where>
- <if test="kuangDuanSBLX != null "> and kuangDuanSBLX = #{kuangDuanSBLX}</if>
- <if test="kuangDuanSBLXMC != null and kuangDuanSBLXMC != ''"> and kuangDuanSBLXMC = #{kuangDuanSBLXMC}</if>
- <if test="sheBeiBM != null and sheBeiBM != ''"> and sheBeiBM = #{sheBeiBM}</if>
- <if test="sheBeiMC != null and sheBeiMC != ''"> and sheBeiMC = #{sheBeiMC}</if>
- <if test="guiGeXH != null and guiGeXH != ''"> and guiGeXH = #{guiGeXH}</if>
- <if test="sheBeiLX != null "> and sheBeiLX = #{sheBeiLX}</if>
- <if test="shengChanRQ != null "> and shengChanRQ = #{shengChanRQ}</if>
- <if test="suoShuXT != null and suoShuXT != ''"> and suoShuXT = #{suoShuXT}</if>
- <if test="anZhuangRQ != null "> and anZhuangRQ = #{anZhuangRQ}</if>
- <if test="anZhuangWZ != null and anZhuangWZ != ''"> and anZhuangWZ = #{anZhuangWZ}</if>
- <if test="shengChanCJ != null and shengChanCJ != ''"> and shengChanCJ = #{shengChanCJ}</if>
- <if test="chuChangBM != null and chuChangBM != ''"> and chuChangBM = #{chuChangBM}</if>
- <if test="anBIaoZSBH != null and anBIaoZSBH != ''"> and anBIaoZSBH = #{anBIaoZSBH}</if>
- <if test="fangBaoZSBH != null and fangBaoZSBH != ''"> and fangBaoZSBH = #{fangBaoZSBH}</if>
- <if test="eDingDY != null "> and eDingDY = #{eDingDY}</if>
- <if test="eDingDL != null "> and eDingDL = #{eDingDL}</if>
- <if test="eDingGL != null "> and eDingGL = #{eDingGL}</if>
- <if test="xiTongBM != null "> and xiTongBM = #{xiTongBM}</if>
- <if test="wenJianFL != null "> and wenJianFL = #{wenJianFL}</if>
- </where>
- </select>
-
- <select id="selectListByGroupBy" parameterType="DlShebeixx" resultMap="DlShebeixxResult">
- select xiTongBM,wenJianFL from dl_shebeixx where xiTongBM is not null and wenJianFL is not null GROUP BY xiTongBM,wenJianFL
- </select>
-
-
- <select id="selectDlShebeixxById" parameterType="Long" resultMap="DlShebeixxResult">
- <include refid="selectDlShebeixxVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertDlShebeixx" parameterType="DlShebeixx" useGeneratedKeys="true" keyProperty="id">
- insert into dl_shebeixx
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="kuangDuanSBLX != null">kuangDuanSBLX,</if>
- <if test="kuangDuanSBLXMC != null">kuangDuanSBLXMC,</if>
- <if test="sheBeiBM != null">sheBeiBM,</if>
- <if test="sheBeiMC != null">sheBeiMC,</if>
- <if test="guiGeXH != null">guiGeXH,</if>
- <if test="sheBeiLX != null">sheBeiLX,</if>
- <if test="shengChanRQ != null">shengChanRQ,</if>
- <if test="suoShuXT != null">suoShuXT,</if>
- <if test="anZhuangRQ != null">anZhuangRQ,</if>
- <if test="anZhuangWZ != null">anZhuangWZ,</if>
- <if test="shengChanCJ != null">shengChanCJ,</if>
- <if test="chuChangBM != null">chuChangBM,</if>
- <if test="anBIaoZSBH != null">anBIaoZSBH,</if>
- <if test="fangBaoZSBH != null">fangBaoZSBH,</if>
- <if test="eDingDY != null">eDingDY,</if>
- <if test="eDingDL != null">eDingDL,</if>
- <if test="eDingGL != null">eDingGL,</if>
- <if test="xiTongBM != null">xiTongBM,</if>
- <if test="wenJianFL != null">wenJianFL,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="kuangDuanSBLX != null">#{kuangDuanSBLX},</if>
- <if test="kuangDuanSBLXMC != null">#{kuangDuanSBLXMC},</if>
- <if test="sheBeiBM != null">#{sheBeiBM},</if>
- <if test="sheBeiMC != null">#{sheBeiMC},</if>
- <if test="guiGeXH != null">#{guiGeXH},</if>
- <if test="sheBeiLX != null">#{sheBeiLX},</if>
- <if test="shengChanRQ != null">#{shengChanRQ},</if>
- <if test="suoShuXT != null">#{suoShuXT},</if>
- <if test="anZhuangRQ != null">#{anZhuangRQ},</if>
- <if test="anZhuangWZ != null">#{anZhuangWZ},</if>
- <if test="shengChanCJ != null">#{shengChanCJ},</if>
- <if test="chuChangBM != null">#{chuChangBM},</if>
- <if test="anBIaoZSBH != null">#{anBIaoZSBH},</if>
- <if test="fangBaoZSBH != null">#{fangBaoZSBH},</if>
- <if test="eDingDY != null">#{eDingDY},</if>
- <if test="eDingDL != null">#{eDingDL},</if>
- <if test="eDingGL != null">#{eDingGL},</if>
- <if test="xiTongBM != null">#{xiTongBM},</if>
- <if test="wenJianFL != null">#{wenJianFL},</if>
- </trim>
- </insert>
-
- <update id="updateDlShebeixx" parameterType="DlShebeixx">
- update dl_shebeixx
- <trim prefix="SET" suffixOverrides=",">
- <if test="kuangDuanSBLX != null">kuangDuanSBLX = #{kuangDuanSBLX},</if>
- <if test="kuangDuanSBLXMC != null">kuangDuanSBLXMC = #{kuangDuanSBLXMC},</if>
- <if test="sheBeiBM != null">sheBeiBM = #{sheBeiBM},</if>
- <if test="sheBeiMC != null">sheBeiMC = #{sheBeiMC},</if>
- <if test="guiGeXH != null">guiGeXH = #{guiGeXH},</if>
- <if test="sheBeiLX != null">sheBeiLX = #{sheBeiLX},</if>
- <if test="shengChanRQ != null">shengChanRQ = #{shengChanRQ},</if>
- <if test="suoShuXT != null">suoShuXT = #{suoShuXT},</if>
- <if test="anZhuangRQ != null">anZhuangRQ = #{anZhuangRQ},</if>
- <if test="anZhuangWZ != null">anZhuangWZ = #{anZhuangWZ},</if>
- <if test="shengChanCJ != null">shengChanCJ = #{shengChanCJ},</if>
- <if test="chuChangBM != null">chuChangBM = #{chuChangBM},</if>
- <if test="anBIaoZSBH != null">anBIaoZSBH = #{anBIaoZSBH},</if>
- <if test="fangBaoZSBH != null">fangBaoZSBH = #{fangBaoZSBH},</if>
- <if test="eDingDY != null">eDingDY = #{eDingDY},</if>
- <if test="eDingDL != null">eDingDL = #{eDingDL},</if>
- <if test="eDingGL != null">eDingGL = #{eDingGL},</if>
- <if test="xiTongBM != null">xiTongBM = #{xiTongBM},</if>
- <if test="wenJianFL != null">wenJianFL = #{wenJianFL},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteDlShebeixxById" parameterType="Long">
- delete from dl_shebeixx where id = #{id}
- </delete>
-
- <delete id="deleteDlShebeixxByIds" parameterType="String">
- delete from dl_shebeixx where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-</mapper>
diff --git a/ruoyi-ui/src/api/dl/cd.js b/ruoyi-ui/src/api/dl/cd.js
deleted file mode 100644
index 2b74262..0000000
--- a/ruoyi-ui/src/api/dl/cd.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-
-// 鏌ヨ璁惧娴嬬偣鍒楄〃
-export function listCd(query) {
- return request({
- url: '/dl/cd/list',
- method: 'get',
- params: query
- })
-}
-
-// 鏌ヨ璁惧娴嬬偣璇︾粏
-export function getCd(id) {
- return request({
- url: '/dl/cd/' + id,
- method: 'get'
- })
-}
-
-// 鍙戦�佹暟鎹埌涓婄骇
-export function toInfoSJ() {
- return request({
- url: '/dl/cd/faSong',
- method: 'get'
- })
-}
-
-// 鏂板璁惧娴嬬偣
-export function addCd(data) {
- return request({
- url: '/dl/cd',
- method: 'post',
- data: data
- })
-}
-
-// 淇敼璁惧娴嬬偣
-export function updateCd(data) {
- return request({
- url: '/dl/cd',
- method: 'put',
- data: data
- })
-}
-
-// 鍒犻櫎璁惧娴嬬偣
-export function delCd(id) {
- return request({
- url: '/dl/cd/' + id,
- method: 'delete'
- })
-}
diff --git a/ruoyi-ui/src/api/dl/shebeixx.js b/ruoyi-ui/src/api/dl/shebeixx.js
deleted file mode 100644
index 4ef196d..0000000
--- a/ruoyi-ui/src/api/dl/shebeixx.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-
-// 鏌ヨ璁惧淇℃伅鍒楄〃
-export function listShebeixx(query) {
- return request({
- url: '/dl/shebeixx/list',
- method: 'get',
- params: query
- })
-}
-
-// 鏌ヨ璁惧淇℃伅璇︾粏
-export function getShebeixx(id) {
- return request({
- url: '/dl/shebeixx/' + id,
- method: 'get'
- })
-}
-
-// 鍙戦�佹暟鎹埌涓婄骇
-export function toInfoSJ() {
- return request({
- url: '/dl/shebeixx/faSong',
- method: 'get'
- })
-}
-
-// 鏂板璁惧淇℃伅
-export function addShebeixx(data) {
- return request({
- url: '/dl/shebeixx',
- method: 'post',
- data: data
- })
-}
-
-// 淇敼璁惧淇℃伅
-export function updateShebeixx(data) {
- return request({
- url: '/dl/shebeixx',
- method: 'put',
- data: data
- })
-}
-
-// 鍒犻櫎璁惧淇℃伅
-export function delShebeixx(id) {
- return request({
- url: '/dl/shebeixx/' + id,
- method: 'delete'
- })
-}
diff --git a/ruoyi-ui/src/api/dl/sssj.js b/ruoyi-ui/src/api/dl/sssj.js
deleted file mode 100644
index cd21bdb..0000000
--- a/ruoyi-ui/src/api/dl/sssj.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁鍒楄〃
-export function listSssj(query) {
- return request({
- url: '/dl/sssj/list',
- method: 'get',
- params: query
- })
-}
-
-// 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁璇︾粏
-export function getSssj(id) {
- return request({
- url: '/dl/sssj/' + id,
- method: 'get'
- })
-}
-
-// 鏂板璁惧娴嬬偣瀹炴椂鏁版嵁
-export function addSssj(data) {
- return request({
- url: '/dl/sssj',
- method: 'post',
- data: data
- })
-}
-
-// 淇敼璁惧娴嬬偣瀹炴椂鏁版嵁
-export function updateSssj(data) {
- return request({
- url: '/dl/sssj',
- method: 'put',
- data: data
- })
-}
-
-// 鍒犻櫎璁惧娴嬬偣瀹炴椂鏁版嵁
-export function delSssj(id) {
- return request({
- url: '/dl/sssj/' + id,
- method: 'delete'
- })
-}
diff --git a/ruoyi-ui/src/api/dl/ycsj.js b/ruoyi-ui/src/api/dl/ycsj.js
deleted file mode 100644
index 0bad91e..0000000
--- a/ruoyi-ui/src/api/dl/ycsj.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁鍒楄〃
-export function listYcsj(query) {
- return request({
- url: '/dl/ycsj/list',
- method: 'get',
- params: query
- })
-}
-
-// 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁璇︾粏
-export function getYcsj(id) {
- return request({
- url: '/dl/ycsj/' + id,
- method: 'get'
- })
-}
-
-// 鏂板璁惧娴嬬偣寮傚父鏁版嵁
-export function addYcsj(data) {
- return request({
- url: '/dl/ycsj',
- method: 'post',
- data: data
- })
-}
-
-// 淇敼璁惧娴嬬偣寮傚父鏁版嵁
-export function updateYcsj(data) {
- return request({
- url: '/dl/ycsj',
- method: 'put',
- data: data
- })
-}
-
-// 鍒犻櫎璁惧娴嬬偣寮傚父鏁版嵁
-export function delYcsj(id) {
- return request({
- url: '/dl/ycsj/' + id,
- method: 'delete'
- })
-}
diff --git a/ruoyi-ui/src/views/dl/cd/index.vue b/ruoyi-ui/src/views/dl/cd/index.vue
deleted file mode 100644
index 28e6f45..0000000
--- a/ruoyi-ui/src/views/dl/cd/index.vue
+++ /dev/null
@@ -1,360 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
- <el-form-item label="娴嬬偣缂栫爜" prop="ceDianBM">
- <el-input
- v-model="queryParams.ceDianBM"
- placeholder="璇疯緭鍏ユ祴鐐圭紪鐮�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷缂栫爜" prop="ceDianLXBM">
- <el-input
- v-model="queryParams.ceDianLXBM"
- placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬬紪鐮�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷鍚嶇О" prop="ceDianLXMC">
- <el-input
- v-model="queryParams.ceDianLXMC"
- placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬪悕绉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鎵�灞炶澶囩紪鐮�" prop="suoShuSBBM">
- <el-input
- v-model="queryParams.suoShuSBBM"
- placeholder="璇疯緭鍏ユ墍灞炶澶囩紪鐮�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['dl:cd:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['dl:cd:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['dl:cd:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['dl:cd:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleToSJ"
- v-hasPermi="['camera:shipingsb:remove']"
- >涓婃姤鏁版嵁</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="cdList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭" align="center" prop="id" />
- <el-table-column label="娴嬬偣缂栫爜" align="center" prop="ceDianBM" />
- <el-table-column label="娴嬬偣绫诲瀷缂栫爜" align="center" prop="ceDianLXBM" />
- <el-table-column label="娴嬬偣绫诲瀷鍚嶇О" align="center" prop="ceDianLXMC" />
- <el-table-column label="鎵�灞炶澶囩紪鐮�" align="center" prop="suoShuSBBM" />
- <el-table-column label="娴嬬偣浣嶇疆" align="center" prop="ceDianWZ" />
- <el-table-column label="娴嬮噺鍊煎崟浣�" align="center" prop="ceLiangZDW" />
- <el-table-column label="閲忕▼涓婇檺" align="center" prop="liangChenSX" />
- <el-table-column label="閲忕▼涓嬮檺" align="center" prop="liangChenXX" />
- <el-table-column label="鎶ヨ涓婇檺" align="center" prop="biaoJingSX" />
- <el-table-column label="鎶ヨ涓嬮檺" align="center" prop="biaoJingXX" />
- <el-table-column label="浼犳劅鍣ㄥ叧鑱斿叧绯�" align="center" prop="chuanGanQGLGX" />
- <el-table-column label="鏁版嵁瀹氫箟鏃堕棿" align="center" prop="shuJuDYSJ" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.shuJuDYSJ, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['dl:cd:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['dl:cd:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀硅澶囨祴鐐瑰璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-form-item label="娴嬬偣缂栫爜" prop="ceDianBM">
- <el-input v-model="form.ceDianBM" placeholder="璇疯緭鍏ユ祴鐐圭紪鐮�" />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷缂栫爜" prop="ceDianLXBM">
- <el-input v-model="form.ceDianLXBM" placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬬紪鐮�" />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷鍚嶇О" prop="ceDianLXMC">
- <el-input v-model="form.ceDianLXMC" placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬪悕绉�" />
- </el-form-item>
- <el-form-item label="鎵�灞炶澶囩紪鐮�" prop="suoShuSBBM">
- <el-input v-model="form.suoShuSBBM" placeholder="璇疯緭鍏ユ墍灞炶澶囩紪鐮�" />
- </el-form-item>
- <el-form-item label="娴嬬偣浣嶇疆" prop="ceDianWZ">
- <el-input v-model="form.ceDianWZ" placeholder="璇疯緭鍏ユ祴鐐逛綅缃�" />
- </el-form-item>
- <el-form-item label="娴嬮噺鍊煎崟浣�" prop="ceLiangZDW">
- <el-input v-model="form.ceLiangZDW" placeholder="璇疯緭鍏ユ祴閲忓�煎崟浣�" />
- </el-form-item>
- <el-form-item label="閲忕▼涓婇檺" prop="liangChenSX">
- <el-input v-model="form.liangChenSX" placeholder="璇疯緭鍏ラ噺绋嬩笂闄�" />
- </el-form-item>
- <el-form-item label="閲忕▼涓嬮檺" prop="liangChenXX">
- <el-input v-model="form.liangChenXX" placeholder="璇疯緭鍏ラ噺绋嬩笅闄�" />
- </el-form-item>
- <el-form-item label="鎶ヨ涓婇檺" prop="biaoJingSX">
- <el-input v-model="form.biaoJingSX" placeholder="璇疯緭鍏ユ姤璀︿笂闄�" />
- </el-form-item>
- <el-form-item label="鎶ヨ涓嬮檺" prop="biaoJingXX">
- <el-input v-model="form.biaoJingXX" placeholder="璇疯緭鍏ユ姤璀︿笅闄�" />
- </el-form-item>
- <el-form-item label="浼犳劅鍣ㄥ叧鑱斿叧绯�" prop="chuanGanQGLGX">
- <el-input v-model="form.chuanGanQGLGX" placeholder="璇疯緭鍏ヤ紶鎰熷櫒鍏宠仈鍏崇郴" />
- </el-form-item>
- <el-form-item label="鏁版嵁瀹氫箟鏃堕棿" prop="shuJuDYSJ">
- <el-date-picker clearable
- v-model="form.shuJuDYSJ"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鏁版嵁瀹氫箟鏃堕棿">
- </el-date-picker>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listCd, getCd, delCd, addCd, updateCd,toInfoSJ } from "@/api/dl/cd";
-
-export default {
- name: "Cd",
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 璁惧娴嬬偣琛ㄦ牸鏁版嵁
- cdList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- ceDianBM: null,
- ceDianLXBM: null,
- ceDianLXMC: null,
- suoShuSBBM: null,
- ceDianWZ: null,
- ceLiangZDW: null,
- liangChenSX: null,
- liangChenXX: null,
- biaoJingSX: null,
- biaoJingXX: null,
- chuanGanQGLGX: null,
- shuJuDYSJ: null
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- this.getList();
- },
- methods: {
- /** 鏌ヨ璁惧娴嬬偣鍒楄〃 */
- getList() {
- this.loading = true;
- listCd(this.queryParams).then(response => {
- this.cdList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- ceDianBM: null,
- ceDianLXBM: null,
- ceDianLXMC: null,
- suoShuSBBM: null,
- ceDianWZ: null,
- ceLiangZDW: null,
- liangChenSX: null,
- liangChenXX: null,
- biaoJingSX: null,
- biaoJingXX: null,
- chuanGanQGLGX: null,
- shuJuDYSJ: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞璁惧娴嬬偣";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getCd(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼璁惧娴嬬偣";
- });
- },
- /** 鍙戦�佹暟鎹埌涓婄骇 */
- handleToSJ() {
- toInfoSJ().then(response => {
- this.$modal.msgSuccess("涓婃姤鏁版嵁鎴愬姛");
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateCd(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addCd(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璁惧娴嬬偣缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delCd(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('dl/cd/export', {
- ...this.queryParams
- }, `cd_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/ruoyi-ui/src/views/dl/shebeixx/index.vue b/ruoyi-ui/src/views/dl/shebeixx/index.vue
deleted file mode 100644
index 6dd2144..0000000
--- a/ruoyi-ui/src/views/dl/shebeixx/index.vue
+++ /dev/null
@@ -1,439 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="璁惧绫诲瀷" prop="kuangDuanSBLX">
- <el-select v-model="queryParams.kuangDuanSBLX" placeholder="璇烽�夋嫨鐭跨璁惧绫诲瀷" clearable>
- <el-option
- v-for="dict in dict.type.dl_xitongsblx"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="璁惧缂栫爜" prop="sheBeiBM">
- <el-input
- v-model="queryParams.sheBeiBM"
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="璁惧鍚嶇О" prop="sheBeiMC">
- <el-input
- v-model="queryParams.sheBeiMC"
- placeholder="璇疯緭鍏ヨ澶囧悕绉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
-
- <el-form-item label="鎵�灞炵郴缁�" prop="suoShuXT">
- <el-select v-model="queryParams.suoShuXT" placeholder="璇烽�夋嫨鎵�灞炵郴缁�" clearable>
- <el-option
- v-for="dict in dict.type.dl_xitongbm"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['dl:shebeixx:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['dl:shebeixx:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['dl:shebeixx:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['dl:shebeixx:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleToSJ"
- v-hasPermi="['camera:shipingsb:remove']"
- >涓婃姤鏁版嵁</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="shebeixxList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭" align="center" prop="id" />
- <el-table-column label="鐭跨璁惧绫诲瀷" align="center" prop="kuangDuanSBLX">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.dl_xitongsblx" :value="scope.row.kuangDuanSBLX"/>
- </template>
- </el-table-column>
- <el-table-column label="鐭跨璁惧绫诲瀷鍚嶇О" align="center" prop="kuangDuanSBLXMC" />
- <el-table-column label="璁惧缂栫爜" align="center" prop="sheBeiBM" />
- <el-table-column label="璁惧鍚嶇О" align="center" prop="sheBeiMC" />
- <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="guiGeXH" />
- <el-table-column label="璁惧绫诲埆" align="center" prop="sheBeiLX">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.dl_biandianzsblx" :value="scope.row.sheBeiLX"/>
- </template>
- </el-table-column>
- <el-table-column label="鐢熶骇鏃ユ湡" align="center" prop="shengChanRQ" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.shengChanRQ, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎵�灞炵郴缁�" align="center" prop="suoShuXT">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.dl_xitongbm" :value="scope.row.suoShuXT"/>
- </template>
- </el-table-column>
- <el-table-column label="瀹夎鏃ユ湡" align="center" prop="anZhuangRQ" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.anZhuangRQ, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="瀹夎浣嶇疆" align="center" prop="anZhuangWZ" />
- <el-table-column label="鐢熶骇鍘傚" align="center" prop="shengChanCJ" />
- <el-table-column label="鍑哄巶缂栫爜" align="center" prop="chuChangBM" />
- <el-table-column label="瀹夋爣璇佷功缂栧彿" align="center" prop="anBIaoZSBH" />
- <el-table-column label="闃茬垎璇佷功缂栧彿" align="center" prop="fangBaoZSBH" />
- <el-table-column label="棰濆畾鐢靛帇" align="center" prop="eDingDY" />
- <el-table-column label="棰濆畾鐢垫祦" align="center" prop="eDingDL" />
- <el-table-column label="棰濆畾鍔熺巼" align="center" prop="eDingGL" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['dl:shebeixx:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['dl:shebeixx:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀硅澶囦俊鎭璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-form-item label="璁惧绫诲瀷" prop="kuangDuanSBLX">
- <el-select v-model="form.kuangDuanSBLX" placeholder="璇烽�夋嫨鐭跨璁惧绫诲瀷">
- <el-option
- v-for="dict in dict.type.dl_xitongsblx"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璁惧绫诲瀷鍚嶇О" prop="kuangDuanSBLXMC">
- <el-input v-model="form.kuangDuanSBLXMC" placeholder="璇疯緭鍏ョ熆绔澶囩被鍨嬪悕绉�" />
- </el-form-item>
- <el-form-item label="璁惧缂栫爜" prop="sheBeiBM">
- <el-input v-model="form.sheBeiBM" placeholder="璇疯緭鍏ヨ澶囩紪鐮�" />
- </el-form-item>
- <el-form-item label="璁惧鍚嶇О" prop="sheBeiMC">
- <el-input v-model="form.sheBeiMC" placeholder="璇疯緭鍏ヨ澶囧悕绉�" />
- </el-form-item>
- <el-form-item label="瑙勬牸鍨嬪彿" prop="guiGeXH">
- <el-input v-model="form.guiGeXH" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
- </el-form-item>
- <el-form-item label="璁惧绫诲埆" prop="sheBeiLX">
- <el-select v-model="form.sheBeiLX" placeholder="璇烽�夋嫨璁惧绫诲埆">
- <el-option
- v-for="dict in dict.type.dl_biandianzsblx"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鐢熶骇鏃ユ湡" prop="shengChanRQ">
- <el-date-picker clearable
- v-model="form.shengChanRQ"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鐢熶骇鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鎵�灞炵郴缁�" prop="suoShuXT">
- <el-select v-model="form.suoShuXT" placeholder="璇烽�夋嫨鎵�灞炵郴缁�">
- <el-option
- v-for="dict in dict.type.dl_xitongbm"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="瀹夎鏃ユ湡" prop="anZhuangRQ">
- <el-date-picker clearable
- v-model="form.anZhuangRQ"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨瀹夎鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="瀹夎浣嶇疆" prop="anZhuangWZ">
- <el-input v-model="form.anZhuangWZ" placeholder="璇疯緭鍏ュ畨瑁呬綅缃�" />
- </el-form-item>
- <el-form-item label="鐢熶骇鍘傚" prop="shengChanCJ">
- <el-input v-model="form.shengChanCJ" placeholder="璇疯緭鍏ョ敓浜у巶瀹�" />
- </el-form-item>
- <el-form-item label="鍑哄巶缂栫爜" prop="chuChangBM">
- <el-input v-model="form.chuChangBM" placeholder="璇疯緭鍏ュ嚭鍘傜紪鐮�" />
- </el-form-item>
- <el-form-item label="瀹夋爣璇佷功缂栧彿" prop="anBIaoZSBH">
- <el-input v-model="form.anBIaoZSBH" placeholder="璇疯緭鍏ュ畨鏍囪瘉涔︾紪鍙�" />
- </el-form-item>
- <el-form-item label="闃茬垎璇佷功缂栧彿" prop="fangBaoZSBH">
- <el-input v-model="form.fangBaoZSBH" placeholder="璇疯緭鍏ラ槻鐖嗚瘉涔︾紪鍙�" />
- </el-form-item>
- <el-form-item label="棰濆畾鐢靛帇" prop="eDingDY">
- <el-input v-model="form.eDingDY" placeholder="璇疯緭鍏ラ瀹氱數鍘�" />
- </el-form-item>
- <el-form-item label="棰濆畾鐢垫祦" prop="eDingDL">
- <el-input v-model="form.eDingDL" placeholder="璇疯緭鍏ラ瀹氱數娴�" />
- </el-form-item>
- <el-form-item label="棰濆畾鍔熺巼" prop="eDingGL">
- <el-input v-model="form.eDingGL" placeholder="璇疯緭鍏ラ瀹氬姛鐜�" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listShebeixx, getShebeixx, delShebeixx, addShebeixx, updateShebeixx ,toInfoSJ} from "@/api/dl/shebeixx";
-
-export default {
- name: "Shebeixx",
- dicts: ['dl_xitongbm', 'dl_xitongsblx', 'dl_biandianzsblx'],
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 璁惧淇℃伅琛ㄦ牸鏁版嵁
- shebeixxList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- kuangDuanSBLX: null,
- kuangDuanSBLXMC: null,
- sheBeiBM: null,
- sheBeiMC: null,
- guiGeXH: null,
- sheBeiLX: null,
- shengChanRQ: null,
- suoShuXT: null,
- anZhuangRQ: null,
- anZhuangWZ: null,
- shengChanCJ: null,
- chuChangBM: null,
- anBIaoZSBH: null,
- fangBaoZSBH: null,
- eDingDY: null,
- eDingDL: null,
- eDingGL: null
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- this.getList();
- },
- methods: {
- /** 鏌ヨ璁惧淇℃伅鍒楄〃 */
- getList() {
- this.loading = true;
- listShebeixx(this.queryParams).then(response => {
- this.shebeixxList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- kuangDuanSBLX: null,
- kuangDuanSBLXMC: null,
- sheBeiBM: null,
- sheBeiMC: null,
- guiGeXH: null,
- sheBeiLX: null,
- shengChanRQ: null,
- suoShuXT: null,
- anZhuangRQ: null,
- anZhuangWZ: null,
- shengChanCJ: null,
- chuChangBM: null,
- anBIaoZSBH: null,
- fangBaoZSBH: null,
- eDingDY: null,
- eDingDL: null,
- eDingGL: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞璁惧淇℃伅";
- },
-
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getShebeixx(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼璁惧淇℃伅";
- });
- },
- /** 鍙戦�佹暟鎹埌涓婄骇 */
- handleToSJ() {
- toInfoSJ().then(response => {
- this.$modal.msgSuccess("涓婃姤鏁版嵁鎴愬姛");
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateShebeixx(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addShebeixx(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璁惧淇℃伅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delShebeixx(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('dl/shebeixx/export', {
- ...this.queryParams
- }, `shebeixx_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/ruoyi-ui/src/views/dl/sssj/index.vue b/ruoyi-ui/src/views/dl/sssj/index.vue
deleted file mode 100644
index c8c42b4..0000000
--- a/ruoyi-ui/src/views/dl/sssj/index.vue
+++ /dev/null
@@ -1,328 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
- <el-form-item label="娴嬬偣缂栫爜" prop="ceDianBM">
- <el-input
- v-model="queryParams.ceDianBM"
- placeholder="璇疯緭鍏ユ祴鐐圭紪鐮�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷缂栫爜" prop="ceDianLXBM">
- <el-input
- v-model="queryParams.ceDianLXBM"
- placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬬紪鐮�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷鍚嶇О" prop="ceDianLXMC">
- <el-input
- v-model="queryParams.ceDianLXMC"
- placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬪悕绉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鎵�灞炶澶囩紪鐮�" prop="suoShuSBBM">
- <el-input
- v-model="queryParams.suoShuSBBM"
- placeholder="璇疯緭鍏ユ墍灞炶澶囩紪鐮�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="娴嬬偣鐘舵��" prop="ceDianZT">
- <el-input
- v-model="queryParams.ceDianZT"
- placeholder="璇疯緭鍏ユ祴鐐圭姸鎬�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['dl:sssj:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['dl:sssj:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['dl:sssj:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['dl:sssj:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="sssjList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭" align="center" prop="id" />
- <el-table-column label="娴嬬偣缂栫爜" align="center" prop="ceDianBM" />
- <el-table-column label="娴嬬偣绫诲瀷缂栫爜" align="center" prop="ceDianLXBM" />
- <el-table-column label="娴嬬偣绫诲瀷鍚嶇О" align="center" prop="ceDianLXMC" />
- <el-table-column label="鎵�灞炶澶囩紪鐮�" align="center" prop="suoShuSBBM" />
- <el-table-column label="娴嬬偣鏁板��" align="center" prop="ceDianSZ" />
- <el-table-column label="娴嬬偣鏁板�煎崟浣�" align="center" prop="ceDianSZDW" />
- <el-table-column label="娴嬬偣鐘舵��" align="center" prop="ceDianZT" />
- <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="shuJuSJ" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.shuJuSJ, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['dl:sssj:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['dl:sssj:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀硅澶囨祴鐐瑰疄鏃舵暟鎹璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-form-item label="娴嬬偣缂栫爜" prop="ceDianBM">
- <el-input v-model="form.ceDianBM" placeholder="璇疯緭鍏ユ祴鐐圭紪鐮�" />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷缂栫爜" prop="ceDianLXBM">
- <el-input v-model="form.ceDianLXBM" placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬬紪鐮�" />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷鍚嶇О" prop="ceDianLXMC">
- <el-input v-model="form.ceDianLXMC" placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬪悕绉�" />
- </el-form-item>
- <el-form-item label="鎵�灞炶澶囩紪鐮�" prop="suoShuSBBM">
- <el-input v-model="form.suoShuSBBM" placeholder="璇疯緭鍏ユ墍灞炶澶囩紪鐮�" />
- </el-form-item>
- <el-form-item label="娴嬬偣鏁板��" prop="ceDianSZ">
- <el-input v-model="form.ceDianSZ" placeholder="璇疯緭鍏ユ祴鐐规暟鍊�" />
- </el-form-item>
- <el-form-item label="娴嬬偣鏁板�煎崟浣�" prop="ceDianSZDW">
- <el-input v-model="form.ceDianSZDW" placeholder="璇疯緭鍏ユ祴鐐规暟鍊煎崟浣�" />
- </el-form-item>
- <el-form-item label="娴嬬偣鐘舵��" prop="ceDianZT">
- <el-input v-model="form.ceDianZT" placeholder="璇疯緭鍏ユ祴鐐圭姸鎬�" />
- </el-form-item>
- <el-form-item label="鏁版嵁鏃堕棿" prop="shuJuSJ">
- <el-date-picker clearable
- v-model="form.shuJuSJ"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鏁版嵁鏃堕棿">
- </el-date-picker>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listSssj, getSssj, delSssj, addSssj, updateSssj } from "@/api/dl/sssj";
-
-export default {
- name: "Sssj",
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 璁惧娴嬬偣瀹炴椂鏁版嵁琛ㄦ牸鏁版嵁
- sssjList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- ceDianBM: null,
- ceDianLXBM: null,
- ceDianLXMC: null,
- suoShuSBBM: null,
- ceDianSZ: null,
- ceDianSZDW: null,
- ceDianZT: null,
- shuJuSJ: null
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- this.getList();
- },
- methods: {
- /** 鏌ヨ璁惧娴嬬偣瀹炴椂鏁版嵁鍒楄〃 */
- getList() {
- this.loading = true;
- listSssj(this.queryParams).then(response => {
- this.sssjList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- ceDianBM: null,
- ceDianLXBM: null,
- ceDianLXMC: null,
- suoShuSBBM: null,
- ceDianSZ: null,
- ceDianSZDW: null,
- ceDianZT: null,
- shuJuSJ: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞璁惧娴嬬偣瀹炴椂鏁版嵁";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getSssj(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼璁惧娴嬬偣瀹炴椂鏁版嵁";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateSssj(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addSssj(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璁惧娴嬬偣瀹炴椂鏁版嵁缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delSssj(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('dl/sssj/export', {
- ...this.queryParams
- }, `sssj_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/ruoyi-ui/src/views/dl/ycsj/index.vue b/ruoyi-ui/src/views/dl/ycsj/index.vue
deleted file mode 100644
index b017d1b..0000000
--- a/ruoyi-ui/src/views/dl/ycsj/index.vue
+++ /dev/null
@@ -1,420 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
- <el-form-item label="娴嬬偣缂栫爜" prop="ceDianBM">
- <el-input
- v-model="queryParams.ceDianBM"
- placeholder="璇疯緭鍏ユ祴鐐圭紪鐮�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷缂栫爜" prop="ceDianLXBM">
- <el-input
- v-model="queryParams.ceDianLXBM"
- placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬬紪鐮�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷鍚嶇О" prop="ceDianLXMC">
- <el-input
- v-model="queryParams.ceDianLXMC"
- placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬪悕绉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鎵�灞炶澶囩紪鐮�" prop="suoShuSBBM">
- <el-select v-model="queryParams.suoShuSBBM" placeholder="璇烽�夋嫨鎵�灞炶澶囩紪鐮�" clearable>
- <el-option
- v-for="dict in dict.type.dl_xitongbm"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="寮傚父绫诲瀷" prop="yiChangLX">
- <el-input
- v-model="queryParams.yiChangLX"
- placeholder="璇疯緭鍏ュ紓甯哥被鍨�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['dl:ycsj:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['dl:ycsj:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['dl:ycsj:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['dl:ycsj:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="ycsjList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭" align="center" prop="id" />
- <el-table-column label="娴嬬偣缂栫爜" align="center" prop="ceDianBM" />
- <el-table-column label="娴嬬偣绫诲瀷缂栫爜" align="center" prop="ceDianLXBM" />
- <el-table-column label="娴嬬偣绫诲瀷鍚嶇О" align="center" prop="ceDianLXMC" />
- <el-table-column label="鎵�灞炶澶囩紪鐮�" align="center" prop="suoShuSBBM">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.dl_xitongbm" :value="scope.row.suoShuSBBM"/>
- </template>
- </el-table-column>
- <el-table-column label="寮傚父绫诲瀷" align="center" prop="yiChangLX" />
- <el-table-column label="寮傚父寮�濮嬫椂闂�" align="center" prop="yiChangKSSJ" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.yiChangKSSJ, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="寮傚父缁撴潫鏃堕棿" align="center" prop="yiChangJSSJ" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.yiChangJSSJ, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="寮傚父鏈熼棿鏈�澶у��" align="center" prop="yiChangQJZDZ" />
- <el-table-column label="鏈�澶у�兼椂鍒�" align="center" prop="zuiDaZSK" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.zuiDaZSK, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="寮傚父鏈熼棿鏈�灏忓��" align="center" prop="yiChangQJZXZ" />
- <el-table-column label="鏈�灏忓�兼椂鍒�" align="center" prop="zuiXiaoZSK" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.zuiXiaoZSK, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="寮傚父鏈熼棿骞冲潎鍊�" align="center" prop="yiChangQJPJZ" />
- <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="shuJuSJ" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.shuJuSJ, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="寮傚父鏁版嵁涔嬪拰" align="center" prop="yiChangSJZH" />
- <el-table-column label="寮傚父鏁版嵁鏁伴噺" align="center" prop="yiChangSJSL" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['dl:ycsj:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['dl:ycsj:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀硅澶囨祴鐐瑰紓甯告暟鎹璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-form-item label="娴嬬偣缂栫爜" prop="ceDianBM">
- <el-input v-model="form.ceDianBM" placeholder="璇疯緭鍏ユ祴鐐圭紪鐮�" />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷缂栫爜" prop="ceDianLXBM">
- <el-input v-model="form.ceDianLXBM" placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬬紪鐮�" />
- </el-form-item>
- <el-form-item label="娴嬬偣绫诲瀷鍚嶇О" prop="ceDianLXMC">
- <el-input v-model="form.ceDianLXMC" placeholder="璇疯緭鍏ユ祴鐐圭被鍨嬪悕绉�" />
- </el-form-item>
- <el-form-item label="鎵�灞炶澶囩紪鐮�" prop="suoShuSBBM">
- <el-select v-model="form.suoShuSBBM" placeholder="璇烽�夋嫨鎵�灞炶澶囩紪鐮�">
- <el-option
- v-for="dict in dict.type.dl_xitongbm"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="寮傚父绫诲瀷" prop="yiChangLX">
- <el-input v-model="form.yiChangLX" placeholder="璇疯緭鍏ュ紓甯哥被鍨�" />
- </el-form-item>
- <el-form-item label="寮傚父寮�濮嬫椂闂�" prop="yiChangKSSJ">
- <el-date-picker clearable
- v-model="form.yiChangKSSJ"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨寮傚父寮�濮嬫椂闂�">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="寮傚父缁撴潫鏃堕棿" prop="yiChangJSSJ">
- <el-date-picker clearable
- v-model="form.yiChangJSSJ"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨寮傚父缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="寮傚父鏈熼棿鏈�澶у��" prop="yiChangQJZDZ">
- <el-input v-model="form.yiChangQJZDZ" placeholder="璇疯緭鍏ュ紓甯告湡闂存渶澶у��" />
- </el-form-item>
- <el-form-item label="鏈�澶у�兼椂鍒�" prop="zuiDaZSK">
- <el-date-picker clearable
- v-model="form.zuiDaZSK"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鏈�澶у�兼椂鍒�">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="寮傚父鏈熼棿鏈�灏忓��" prop="yiChangQJZXZ">
- <el-input v-model="form.yiChangQJZXZ" placeholder="璇疯緭鍏ュ紓甯告湡闂存渶灏忓��" />
- </el-form-item>
- <el-form-item label="鏈�灏忓�兼椂鍒�" prop="zuiXiaoZSK">
- <el-date-picker clearable
- v-model="form.zuiXiaoZSK"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鏈�灏忓�兼椂鍒�">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="寮傚父鏈熼棿骞冲潎鍊�" prop="yiChangQJPJZ">
- <el-input v-model="form.yiChangQJPJZ" placeholder="璇疯緭鍏ュ紓甯告湡闂村钩鍧囧��" />
- </el-form-item>
- <el-form-item label="鏁版嵁鏃堕棿" prop="shuJuSJ">
- <el-date-picker clearable
- v-model="form.shuJuSJ"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鏁版嵁鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="寮傚父鏁版嵁涔嬪拰" prop="yiChangSJZH">
- <el-input v-model="form.yiChangSJZH" placeholder="璇疯緭鍏ュ紓甯告暟鎹箣鍜�" />
- </el-form-item>
- <el-form-item label="寮傚父鏁版嵁鏁伴噺" prop="yiChangSJSL">
- <el-input v-model="form.yiChangSJSL" placeholder="璇疯緭鍏ュ紓甯告暟鎹暟閲�" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listYcsj, getYcsj, delYcsj, addYcsj, updateYcsj } from "@/api/dl/ycsj";
-
-export default {
- name: "Ycsj",
- dicts: ['dl_xitongbm'],
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 璁惧娴嬬偣寮傚父鏁版嵁琛ㄦ牸鏁版嵁
- ycsjList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- ceDianBM: null,
- ceDianLXBM: null,
- ceDianLXMC: null,
- suoShuSBBM: null,
- yiChangLX: null,
- yiChangKSSJ: null,
- yiChangJSSJ: null,
- yiChangQJZDZ: null,
- zuiDaZSK: null,
- yiChangQJZXZ: null,
- zuiXiaoZSK: null,
- yiChangQJPJZ: null,
- shuJuSJ: null,
- yiChangSJZH: null,
- yiChangSJSL: null
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- this.getList();
- },
- methods: {
- /** 鏌ヨ璁惧娴嬬偣寮傚父鏁版嵁鍒楄〃 */
- getList() {
- this.loading = true;
- listYcsj(this.queryParams).then(response => {
- this.ycsjList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- ceDianBM: null,
- ceDianLXBM: null,
- ceDianLXMC: null,
- suoShuSBBM: null,
- yiChangLX: null,
- yiChangKSSJ: null,
- yiChangJSSJ: null,
- yiChangQJZDZ: null,
- zuiDaZSK: null,
- yiChangQJZXZ: null,
- zuiXiaoZSK: null,
- yiChangQJPJZ: null,
- shuJuSJ: null,
- yiChangSJZH: null,
- yiChangSJSL: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞璁惧娴嬬偣寮傚父鏁版嵁";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getYcsj(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼璁惧娴嬬偣寮傚父鏁版嵁";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateYcsj(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addYcsj(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璁惧娴嬬偣寮傚父鏁版嵁缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delYcsj(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('dl/ycsj/export', {
- ...this.queryParams
- }, `ycsj_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/ruoyi-ui/src/views/newIndex.vue b/ruoyi-ui/src/views/newIndex.vue
index 7821233..b61cb09 100644
--- a/ruoyi-ui/src/views/newIndex.vue
+++ b/ruoyi-ui/src/views/newIndex.vue
@@ -285,6 +285,7 @@
methods: {
videoClick(item) {
this.selectCamera=item;
+ this.selectCamera.playUrl = this.selectCamera.playUrl.replace("&width=189","&width=907").replace("&height=117","&height=505");
setTimeout(() => {
this.$refs.indexSpjkSpxx1998Ref.joinSXT(item);
}, 100);
--
Gitblit v1.8.0