Merge remote-tracking branch 'origin/master'

nngkxxdp/pom.xml

@@ -26,6 +26,7 @@
 		<mybatis-spring-boot-starter>1.3.2</mybatis-spring-boot-starter>
 		<cn-hutool.version>5.5.2</cn-hutool.version>
 		<alibaba-fastjson.version>1.2.47</alibaba-fastjson.version>
+		<kotlin.version>1.0.0</kotlin.version>
 	</properties>
 
 	<dependencies>
@@ -189,6 +190,17 @@
 			<artifactId>jsoup</artifactId>
 			<version>1.12.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-stdlib</artifactId>
+			<version>${kotlin.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-test</artifactId>
+			<version>${kotlin.version}</version>
+			<scope>test</scope>
+		</dependency>
 
 	</dependencies>
 
@@ -200,6 +212,47 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.jetbrains.kotlin</groupId>
+				<artifactId>kotlin-maven-plugin</artifactId>
+				<version>${kotlin.version}</version>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>test-compile</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>test-compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>testCompile</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<packaging>jar</packaging>

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/ArticleController.java

@@ -1,5 +1,7 @@
 package com.example.nngkxxdp.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.example.nngkxxdp.entity.Article;
 import com.example.nngkxxdp.service.ArticleService;
 import com.example.nngkxxdp.util.Blank;
@@ -73,6 +75,13 @@ public class ArticleController {
     	map.put("name", name);
     	map.put("page", (page - 1) * limit);
     	map.put("limit", limit);
+        Map<String, Object> picture= articleService.getOffocoalAccountByPaging(map);
+        System.out.println(picture);
+//        for (int i=0;i<picture.size();i++){
+//            System.out.println(i);
+//        }
+//        System.out.println();
+ //       JSONObject jsonObject=JSONObject.parseObject(picture.toString());
     	return articleService.getOffocoalAccountByPaging(map);
     }
 

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/SmsMessageController.java

@@ -138,5 +138,4 @@ public class SmsMessageController {
 		}
 		return smsMessageService.getWechatSmsDetail(page, limit, id);
 	}
-
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/WebsiteSmsController.java

@@ -0,0 +1,74 @@
+package com.example.nngkxxdp.controller;
+
+import com.example.nngkxxdp.service.WebsiteSmsService;
+import com.example.nngkxxdp.util.Blank;
+import com.example.nngkxxdp.util.ConstStr;
+import com.example.nngkxxdp.util.SendUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+@RestController
+@RequestMapping("websitesms")
+public class WebsiteSmsController {
+
+    @Autowired
+    private WebsiteSmsService websiteSmsService;
+    /**
+     * @Title: getWebsiteSms
+     * @Description: 获取网站短信
+     * @param @param page
+     * @param @param limit
+     * @param @return
+     * @return Map<String,Object>
+     * @throws
+     */
+    @GetMapping("getWebsiteSms")
+    public Map<String, Object> getWebsiteSms(Integer page, Integer limit) {
+        if (!Blank.notBlank(page) || !Blank.notBlank(limit)) {
+            return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS);
+        }
+        return websiteSmsService.getWebsiteSms(page, limit);
+    }
+
+
+    /**
+     *
+     * @Title: getWebsiteSmsDetail
+     * @Description: 获取网站短信-详情
+     * @param @param page
+     * @param @param limit
+     * @param @return
+     * @return Map<String,Object>
+     * @throws
+     */
+    @GetMapping("getWebsiteSmsDetail")
+    public Map<String, Object> getWechatSmsDetail(Integer page, Integer limit, Integer id) {
+        System.out.println(id);
+        if (!Blank.notBlank(page) || !Blank.notBlank(limit) || !Blank.notBlank(id)) {
+            return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS);
+        }
+        return websiteSmsService.getWebsiteSmsDetail(page, limit, id);
+    }
+    /**
+     *
+     * @Title: updateWebsiteSms
+     * @Description: 修改短信接收人、电话号码
+     * @param @param leaderperson
+     * @param @param leaderphone
+     * @param @param workperson
+     * @param @param workphone
+     * @param @return
+     * @return Map<String,Object>
+     * @throws
+     */
+    @GetMapping("updateWebsiteSms")
+    public Boolean updateWebsiteSms(String leaderperson, String leaderphone, String workperson, String workphone, HttpServletRequest request){
+        int id=Integer.parseInt( request.getParameter("id"));
+        return websiteSmsService.updateWebsiteSms(leaderperson,leaderphone,workperson,workphone,id);
+    }
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/WebsiteSmsDao.java

@@ -0,0 +1,28 @@
+package com.example.nngkxxdp.dao;
+
+import com.example.nngkxxdp.entity.Wsms;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @Title: WebsiteSmsDao.java
+ * @Package com.example.nngkxxdp.dao
+ * @Description:
+ * @author: yangjiang
+ * @date: 2022年5月10日
+ * @version V1.0
+ */
+public interface WebsiteSmsDao {
+    Integer getCounWebsiteSms();
+
+    List<Map<String, Object>> getWebsiteSms(@Param("page") Integer page, @Param("limit") Integer limit);
+
+    List<Map<String, Object>> getWebsiteSmsDetail(@Param("page") Integer page, @Param("limit") Integer limit, @Param("id") Integer id);
+
+    Wsms setWebsiteSms(Wsms wsms);
+
+    Boolean updateWebsiteSms(@Param("leaderperson") String leaderperson,@Param("leaderphone") String leaderphone,@Param("workperson") String workperson,@Param("workphone") String workphone,@Param("id") Integer id);
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/Wsms.java

@@ -0,0 +1,55 @@
+package com.example.nngkxxdp.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * @Title: Wsms.java
+ * @Package com.example.nngkxxdp.entity
+ * @Description: 短信记录
+ * @author: yangjiang
+ * @date: 2022年5月911日
+ * @version V1.0
+ */
+@Data
+public class Wsms  implements Serializable {
+    private Integer  id;
+    private Date create_time;
+    private String lead_phone;
+    private  String send_content;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Date getCreate_time() {
+        return create_time;
+    }
+
+    public void setCreate_time(Date create_time) {
+        this.create_time = create_time;
+    }
+
+    public String getLead_phone() {
+        return lead_phone;
+    }
+
+    public void setLead_phone(String lead_phone) {
+        this.lead_phone = lead_phone;
+    }
+
+    public String getSend_content() {
+        return send_content;
+    }
+
+    public void setSend_content(String send_content) {
+        this.send_content = send_content;
+    }
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/service/WebsiteSmsService.java

@@ -0,0 +1,26 @@
+package com.example.nngkxxdp.service;
+
+import com.example.nngkxxdp.entity.Wsms;
+
+import java.util.Map;
+
+/**
+ *
+ * @Title: WebsiteSmsService.java
+ * @Package com.example.nngkxxdp.service
+ * @Description:
+ * @author: yangjiang
+ * @date: 2022年5月10日
+ * @version V1.0
+ */
+public interface WebsiteSmsService {
+
+    Map<String, Object> getWebsiteSms(Integer page, Integer limit);
+
+    Map<String, Object> getWebsiteSmsDetail(Integer page, Integer limit,Integer id);
+
+    Wsms setWebsiteSms(Wsms wsms);
+
+    Boolean updateWebsiteSms(String leaderperson,String leaderphone,String workperson,String workphone,Integer id);
+
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/WebsiteSmsServiceImpl.java

@@ -0,0 +1,55 @@
+package com.example.nngkxxdp.service.impl;
+
+import com.example.nngkxxdp.dao.WebsiteSmsDao;
+import com.example.nngkxxdp.entity.Wsms;
+import com.example.nngkxxdp.service.WebsiteSmsService;
+import com.example.nngkxxdp.util.Blank;
+import com.example.nngkxxdp.util.SendUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+/**
+ *
+ * @Title: WebsiteSmsServiceImpl.java
+ * @Package com.example.nngkxxdp.service.impl
+ * @Description:
+ * @author: yangjiang
+ * @date: 2022年5月10日
+ * @version V1.0
+ */
+@Service
+public class WebsiteSmsServiceImpl implements WebsiteSmsService {
+    @Autowired
+    private WebsiteSmsDao websiteSmsDao;
+
+    @Override
+    public Map<String, Object> getWebsiteSms(Integer page, Integer limit) {
+        Integer count = websiteSmsDao.getCounWebsiteSms();
+        if (Blank.isEmpty(count) || count == 0) {
+            return SendUtil.layuiTable(0, null);
+        }
+        return SendUtil.layuiTable(count, websiteSmsDao.getWebsiteSms(page,limit));
+    }
+
+    @Override
+    public Map<String, Object> getWebsiteSmsDetail(Integer page, Integer limit, Integer id) {
+        Integer count = websiteSmsDao.getCounWebsiteSms();
+        if (Blank.isEmpty(count) || count == 0) {
+            return SendUtil.layuiTable(0, null);
+        }
+        return SendUtil.layuiTable(count, websiteSmsDao.getWebsiteSmsDetail(page,limit,id));
+    }
+
+    @Override
+    public Wsms setWebsiteSms(Wsms wsms) {
+        return websiteSmsDao.setWebsiteSms(wsms);
+    }
+
+    @Override
+    public Boolean updateWebsiteSms(String leaderperson, String leaderphone, String workperson, String workphone,Integer id) {
+        return websiteSmsDao.updateWebsiteSms(leaderperson,leaderphone,workperson,workphone,id);
+    }
+
+
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/util/WebsiteSmsUtil.java

@@ -5,6 +5,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.fastjson.JSONObject;
+import com.example.nngkxxdp.entity.Wsms;
+import com.example.nngkxxdp.service.WebsiteSmsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
@@ -31,6 +34,8 @@ public class WebsiteSmsUtil {
 	
 	@Autowired
 	private TjService tjService;
+	@Autowired
+	private WebsiteSmsService websiteSmsService;
 	
 	@Value("${sms.custom}")
 	private String custom;
@@ -99,7 +104,10 @@ public class WebsiteSmsUtil {
 			    .form(map)
 			    .execute().body();
 		System.err.println("body==========:"+result);
+		Wsms wsms =new Wsms();
+		wsms.setSend_content(content);;
+		wsms.setLead_phone(phone);
+		wsms.setCreate_time(new Date());
+		websiteSmsService.setWebsiteSms(wsms);
 	}
-	
-
 }

nngkxxdp/src/main/resources/application.yml

@@ -1,36 +0,0 @@
-spring:
-  profiles:
-    active: dev
-
-mybatis:
-  mapper-locations: classpath:mapper/*.xml
-  configuration:
-    #开启自动下划线格式转驼峰格式
-    map-underscore-to-camel-case: true
-  type-aliases-package: com.example.nngkxxdp.entity
-
-#登录配置
-login:
-  # 登录token过期时间，单位：分钟
-  loginOutTime: 60
-  specialChar:
-    #不被转义字符的uri,多个以“,”隔开
-    filterUris:
-    #被转义的特殊字符、转义字符,格式：*,*and*,*
-    specialChar: <,&lt;and>,&gt;and%3C,&lt;and%3E,&gt;
-
-sms:
-  # 上升
-  up: http://data.cqna.gov.cn/app/evaluation.html
-  # 下降
-  down: http://data.cqna.gov.cn/app/evaluation.html
-  #自定义短信接口
-  custom: http://173.10.3.103:8081/sms/sendSms
-huaweiAddress:
-  requestUrl: https://iam.cn-north-4.myhuaweicloud.com/v3/auth/tokens
-  name: hw65077913
-  password: 123456Aa?
-  responseUrl: https://cbs-ext.cn-north-4.myhuaweicloud.com/v1/0e787d77ed8091292f83c002f3a16d7b/qabots/b5b458e8-7a94-4163-9119-321304a83bf5/chat
-
-
-

nngkxxdp/src/main/resources/mapper/WebsiteSmsDao.xml

@@ -0,0 +1,46 @@
+<?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.example.nngkxxdp.dao.WebsiteSmsDao">
+    <select id="getCounWebsiteSms" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM w_sms
+    </select>
+
+    <select id="getWebsiteSms" resultType="java.util.Map">
+        SELECT w.id,
+               t.leaderperson,
+               t.leaderphone,
+               t.workperson,
+               t.workphone,
+               w.send_content,
+               t1.deptname,
+               DATE_FORMAT(w.create_time ,'%Y-%m-%d %H:%i') create_time
+        FROM w_sms w
+                 INNER JOIN t_user t
+                 INNER join t_dept t1
+                            ON w.lead_phone = t.leaderphone
+                            and t.deptid = t1.deptid
+            LIMIT 999999999
+    </select>
+
+    <select id="getWebsiteSmsDetail" resultType="java.util.Map">
+        SELECT id,create_time,lead_phone,send_content from w_sms where id=#{id} ORDER BY create_time DESC
+            LIMIT #{page}, #{limit}
+    </select>
+
+    <insert id="setWebsiteSms" parameterType="com.example.nngkxxdp.entity.Wsms">
+        INSERT INTO Wsms (create_time,lead_phone,send_content)
+        VALUES (#{create_time},
+                #{lead_phone},
+                #{send_content}
+    </insert>
+
+    <update id="updateWebsiteSms">
+        UPDATE t_user
+        SET leaderperson = #{leaderperson}
+            AND leaderphone = #{leaderphone}
+            AND workperson = #{workperson}
+            AND workphone = #{workphone}
+        WHERE
+            id = #{id}
+    </update>
+</mapper>

nngkxxdp/src/main/resources/static/intelligence/css/intelligence.css

@@ -752,10 +752,10 @@ footer {
 }
 
 .footer-drop ul li a:hover {
-    color: #BF1628;
+	color: #BF1628;
 }
 
-@media screen and (max-width: 1360px) {
+@media screen and (max-width: 1359px) {
 	.top_img {
 		width: 27%;
 		margin-right: 5%;
@@ -767,17 +767,17 @@ footer {
 	}
 
 	.red_left {
-		bottom: -22%;
+		bottom: -24%;
 		left: -10%;
 	}
 
 	.red_center {
 		bottom: 0;
-		left: 23%;
+		left: 1%;
 	}
 
 	.red_right {
-		bottom: -21%;
+		bottom: -23%;
 		right: -12%;
 	}
 
@@ -787,7 +787,7 @@ footer {
 	}
 
 	.footer-drop {
-		width: 131px;
+		width: 138px;
 		margin-right: 20px;
 	}
 
@@ -804,7 +804,7 @@ footer {
 	}
 }
 
-@media screen and (min-width:1361px) and (max-width:1440px) {
+@media screen and (min-width:1360px) and (max-width:1440px) {
 	.top_img {
 		width: 27%;
 		margin-right: 5%;
@@ -822,11 +822,11 @@ footer {
 
 	.red_center {
 		bottom: 0;
-		left: 22%;
+		left: -1%;
 	}
 
 	.red_right {
-		bottom: -20%;
+		bottom: -21%;
 		right: -11%;
 	}
 
@@ -836,7 +836,7 @@ footer {
 	}
 
 	.footer-drop {
-		width: 131px;
+		width: 138px;
 		margin-right: 20px;
 	}
 

nngkxxdp/src/main/resources/static/mxt/js/index.js

@@ -107,6 +107,7 @@ function initCenterByLeft(data) {
 		if (data[i].wType != '微信公众号') {
 			continue;
 		}
+		
 		if (data[i].wName == topModule[0]) {
 			topHtml = '<div class="gzh-item" onclick="wechartClick(this)">'
 				+ '		<div class="gzh gzh-active">'

nngkxxdp/src/main/resources/static/page/js/base/fbtx.item.js

@@ -128,7 +128,7 @@ function openCheckPhoneWindows(data){
 	}
 	var str = "";
 	if(data.leaderperson && data.leaderphone){
-		str += '<div class="layui-form-item" style="margin-left:30px;height: 16px;">'
+		str += '<div class="layui-form-item" style="margin-left:10px;height: 40px;">'
 			+ '<div class="layui-form-block">'
 			+ '<input type="checkbox" value="1" title="'
 			+ data.leaderperson + '(分管领导)(' + data.leaderphone + ')'
@@ -136,9 +136,8 @@ function openCheckPhoneWindows(data){
 			+ '</div>'
 			+ '</div>';
 	}
-
 	if(data.workperson && data.workphone){
-		str += '<div class="layui-form-item" style="margin-left:30px;height: 16px;">'
+		str += '<div class="layui-form-item" style="margin-left:10px;height: 40px;" >'
 			+ '<div class="layui-form-block">'
 			+ '<input type="checkbox" value="2" title="'
 			+ data.workperson + '(工作人员)(' + data.workphone + ')'
@@ -158,7 +157,7 @@ function openCheckPhoneWindows(data){
 		  title: '短信发送的人员',
 		  content: $('#dxtxDiv'),
 		  area: ['300px'],
-		  btn: ['发送'],
+		  btn: ['发送','修改'],
 		  yes: function(index, layero){
 			  var types = new Array();
 			  $('#dxtxForm input[type=checkbox]:checked').each(function() {
@@ -169,6 +168,43 @@ function openCheckPhoneWindows(data){
 				  return;
 			  }
 			  addMessage(types, index);
+		  },
+		  btn2:function (index,layero){
+			  layer.open({
+				  type: 1,
+				  title: '短信发送的人员信息修改',
+				  content: $('#web_sitesms'),
+				  area: ['450px','380px'],
+				  btn: ['立即修改','取消'],
+				  yes: function(index, layero){
+				  	  var leaderperson =$('#leaderperson').val()
+					  var leaderphone =$('#leaderphone').val()
+					  var workperson =$('#workperson').val()
+					  var workphone =$('#workphone').val()
+					  $.ajax({
+						  url: PATH + '/websitesms/updateWebsiteSms',
+						  type: 'get',
+						  data: {
+						  	  "id":data.id,
+							  "leaderperson":leaderperson,
+							  "leaderphone":leaderphone,
+							  "workperson":workperson,
+							  "workphone":workphone,
+						  },
+						  success: function (suc) {
+						  	alert(suc);
+							  if (suc == true) {
+								  layer.msg("修改成功", {icon: 1});
+							  } else {
+								  layer.msg("修改失败", {icon: 5});
+							  }
+						  }
+					  });
+				  },
+				  btn2:function (index,layero){
+
+				  }
+			  });
 		  }
 	});
 }
@@ -601,6 +637,29 @@ function initSmsTable() {
 		}}
     ]]
   });
+
+	//网站短信记录
+	table.render({
+		elem: '#w-sms-website-table',
+		url: '/websitesms/getWebsiteSms',
+		skin: 'line',
+		cols: [[
+			{width:80, title: '序号', type: 'numbers'},
+			{field:'deptname', title: '部门名称'},
+			{title: '分管领导', templet: function(d) {
+					return d.leaderperson + "  " + d.leaderphone;
+				}},
+			{title: '工作人员', templet: function(d) {
+					return d.workperson + "  " + d.workphone;
+				}},
+			{title: '提醒记录', templet: function(d) {
+					return d.createTime + ""+ d.createTime;
+				}},
+			{title: '操作', templet: function(d) {
+					return '<a style="color:#1276ff;cursor: pointer;" onclick="initSmsTableDetail(\''+ d.staffName +'\',\''+ d.leadName +'\',\''+ (d.wType + '-' + d.wName) +'\',\''+ d.id +'\')">详情</a>';
+				}}
+		]]
+	});
   
   	$('#w-sms-back').on('click', function() {
 		$('#w-sms-back').addClass('layui-hide');
@@ -635,7 +694,24 @@ function initSmsTableDetail(staffName, leadName, wechat, id) {
     ]]
 	});
 }
-
+function  a(id){
+	$('#w-sms-back').removeClass('layui-hide');
+	$('.w-sms-wai-div').addClass('layui-hide');
+	//网站短信查看详情
+	table.reload('w-sms-website-table', {
+		url: '/websitesms/getWebsiteSmsDetail',
+		where: {
+			'id': id
+		},
+		page: true,
+		cols: [[
+			{field:'createTime', title: '发送时间', width: '15%'},
+			{title: '发送内容', templet: function(d) {
+					return d.sendContent;
+				}},
+		]]
+	});
+}
 function reloadSmsTable() {
 	table.reload('w-sms-wechat-table', {
 		url: '/smsmessage/getWechatSms',
@@ -658,5 +734,27 @@ function reloadSmsTable() {
 			}}
 	    ]]
 	});
+
+	//网站短信记录
+	table.reload('w-sms-website-table', {
+		url: '/websitesms/getWebsiteSms',
+		page: false,
+		cols: [[
+			{width:80, title: '序号', type: 'numbers'},
+			{field:'deptname', title: '部门名称'},
+			{title: '分管领导', templet: function(d) {
+					return d.leaderperson + "  " + d.leaderphone;
+				}},
+			{title: '工作人员', templet: function(d) {
+					return d.workperson + "  " + d.workphone;
+				}},
+			{title: '提醒记录', templet: function(d) {
+					return d.createTime;
+				}},
+			{title: '操作', templet: function(d) {
+					return '<a style="color:#1276ff;cursor: pointer;" onclick="initSmsTableDetail(\''+ d.staffName +'\',\''+ d.leadName +'\',\''+ (d.wType + '-' + d.wName) +'\',\''+ d.id +'\')">详情</a>';
+				}}
+		]]
+	});
 }