Merge remote-tracking branch 'origin/upgrade' into upgrade

src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java

@@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+
 import javax.mail.search.SearchException;
 import java.util.*;
 import java.util.concurrent.*;
@@ -134,7 +135,7 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
                     }
                 }
             }
-        }else {
+        } else {
             // 删除旧的所有的入住信息
             if (isAllData) {
                 // 全部删除
@@ -435,7 +436,7 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
                 if (null != populationInfoMap) {
                     populationInfoDTO = populationInfoMap
                             .get(populationDTO.getPopulationInfoId());
-                    if (null != populationInfoDTO) {
+                    if (null != populationInfoDTO && !StringUtils.contains(populationInfoDTO.getBirthday(), "*")) {
                         populationInfoService.getTuoMin(populationInfoDTO);
                     }
                 } else {
@@ -535,7 +536,7 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
 
         // 将populationInfoIds分割成多个子列表，每个子列表由一个任务处理
         int chunkSize = (int) Math.ceil((double) populationInfoIds.size() / numThreads);
-        chunkSize = chunkSize == 0? 1 : chunkSize;
+        chunkSize = chunkSize == 0 ? 1 : chunkSize;
         List<List<String>> chunks = Lists.partition(populationInfoIds, chunkSize);
 
         for (List<String> chunk : chunks) {
@@ -578,7 +579,7 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
         if (!CollectionUtils.isEmpty(populationInfoBaseDTOs)) {
             baseMap = populationInfoBaseDTOs.stream()
                     .collect(Collectors.toMap(PopulationInfoBaseDTO::getPopulationInfoId,
-                            baseDTO -> baseDTO));
+                            baseDTO -> baseDTO, (baseDTO1, baseDTO2) -> baseDTO2));
         }
 
         for (PopulationDTO populationDTO : overList) {
@@ -587,7 +588,10 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
                 if (null != baseMap) {
                     // 获取人员
                     populationInfoBaseDTO = baseMap.get(populationDTO.getPopulationInfoId());
+                    // 这里为什么会有已经脱敏的数据
+                    if (populationInfoBaseDTO != null && !StringUtils.contains(populationInfoBaseDTO.getBirthday(), "*")) {
                         populationInfoService.getTuoMin(populationInfoBaseDTO);
+                    }
                 } else {
                     populationInfoBaseDTO = setPopulationBaseInfo(populationDTO);
                 }

src/main/resources/static/assets/js/vendor/zTree3/css/metroStyle/metroStyle.css

@@ -94,3 +94,6 @@ span.tmpzTreeMove_arrow {width:16px; height:21px; display: inline-block; padding
 
 ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
 .ztreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
+/* 深色调整 */
+.ztree li a {border: none; color: #FFFFFF;}
+.ztree li a.curSelectedNode {color: #FFFFFF;}

src/main/resources/static/assets/layuiadmin/config.js

@@ -39,9 +39,15 @@ layui.define(['laytpl', 'layer', 'element', 'util'], function (exports) {
         , theme: {
             //内置主题配色方案
             color: [{
+                main: 'rgba(6, 39, 88, 1)'
+                , logo: 'rgba(6, 39, 88, 1)'
+                , selected: 'linear-gradient(blue, pink);'
+                , header: 'rgba(6, 39, 88, 1)'
+                , alias: 'default' //紫红头
+            }, {
                 main: '#20222A' //主题色
                 , selected: '#009688' //选中色
-                , alias: 'default' //默认别名
+                , alias: 'default-old' //默认别名
             }, {
                 main: '#03152A'
                 , selected: '#3B91FF'

src/main/resources/static/assets/layuiadmin/style/admin.css

@@ -11,20 +11,18 @@ html #layuicss-layuiAdmin {
 }
 
 /** 滚动条 **/
-/*
 ::-webkit-scrollbar{width: 10px; height: 10px;}
 ::-webkit-scrollbar-button:vertical{display: none;}
-::-webkit-scrollbar-track, ::-webkit-scrollbar-corner{background-color: #e2e2e2;}
-::-webkit-scrollbar-thumb{border-radius: 0; background-color: rgba(0,0,0,.3);}
-::-webkit-scrollbar-thumb:vertical:hover{background-color: rgba(0,0,0,.35);}
-::-webkit-scrollbar-thumb:vertical:active{background-color: rgba(0,0,0,.38);}
-*/
+::-webkit-scrollbar-track, ::-webkit-scrollbar-corner{background-color: rgba(255, 255, 255, .4);}
+::-webkit-scrollbar-thumb{border-radius: 0; background-color: rgba(6, 39, 88, .6);}
+::-webkit-scrollbar-thumb:vertical:hover{background-color: rgba(6, 39, 88, .8);}
+::-webkit-scrollbar-thumb:vertical:active{background-color: rgba(6, 39, 88, 1);}
 
 
 /* 全局 */
 html {
-    background-color: #f2f2f2;
-    color: #666;
+    background-color: rgba(6, 39, 88, 1);
+    color: #ffffff;
 }
 
 *[template],
@@ -53,7 +51,7 @@ html {
 */
 
 .layui-layout-admin .layui-header .layui-nav .layui-nav-child a {
-    color: #333;
+    color: #FFFFFF;
 }
 
 .layui-layout-admin .layui-side {
@@ -342,8 +340,7 @@ html {
     top: 0 !important;
     bottom: auto;
     height: 3px;
-    background-color: #fff;
-    background-color: rgba(255, 255, 255, .3);
+    background-color: rgba(6, 39, 88, .55);
 }
 
 /* 遮罩 */
@@ -501,9 +498,9 @@ html {
     height: 40px;
     line-height: 40px;
     padding: 0 80px 0 40px; /*border-bottom: 2px solid #292B34;*/
-    background-color: #fff;
+    background-color: rgba(6, 39, 88, .9);
     box-sizing: border-box;
-    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .1);
+    box-shadow: 0 1px 2px 0 rgba(255, 255, 255, 1);
 }
 
 .layadmin-pagetabs .layadmin-tabs-control {
@@ -557,19 +554,24 @@ html {
 }
 
 .layadmin-tabs-select.layui-nav .layui-nav-item a {
-    color: #666;
+    color: #FFFFFF;
 }
 
 .layadmin-tabs-select.layui-nav .layui-nav-child {
     top: 40px;
     left: auto;
     right: 0;
+    background-color: rgba(6, 39, 88,.9);
 }
 
 .layadmin-tabs-select.layui-nav .layui-nav-child dd.layui-this,
 .layadmin-tabs-select.layui-nav .layui-nav-child dd.layui-this a {
-    background-color: #f2f2f2 !important;
-    color: #333;
+    background-color: rgba(6, 39, 88, 1) !important;
+    color: #FFFFFF;
+}
+
+.layadmin-tabs-select.layui-nav .layui-show {
+    background-color: rgba(6, 39, 88, 1) !important;
 }
 
 .layadmin-tabs-select.layui-nav .layui-nav-more,
@@ -637,7 +639,7 @@ html {
 
 .layadmin-pagetabs .layui-tab-title li:hover,
 .layadmin-pagetabs .layui-tab-title li.layui-this {
-    background-color: #f6f6f6;
+    background-color: rgba(6, 39, 88, 1);
 }
 
 .layadmin-pagetabs .layui-tab-title li.layui-this:after {
@@ -675,16 +677,16 @@ html {
 .layui-layout-admin .layui-header {
     border-bottom: 1px solid #f6f6f6;
     box-sizing: border-box;
-    background-color: #fff;
+    background-color: rgba(6, 39, 88, .9);
 }
 
 .layui-layout-admin .layui-header a,
 .layui-layout-admin .layui-header a cite {
-    color: #333;
+    color: #FFFFFF;
 }
 
 .layui-layout-admin .layui-header a:hover {
-    color: #000;
+    color: #FFFFFF;
 }
 
 .layui-layout-admin .layui-header .layui-nav .layui-nav-more {
@@ -1614,3 +1616,74 @@ html {
 .search-item-width-400 {width: 400px}
 .search-item-width-500 {width: 500px}
 .left-tree-wrap {padding: 0px;}
+/* 深色调整 */
+.layui-tab-title .layui-this {color: #FFFFFF;}
+.layadmin-pagetabs .layui-icon-prev:hover {background-color: rgba(6, 39, 88, 1);}
+.layadmin-pagetabs .layui-icon-next:hover {background-color: rgba(6, 39, 88, 1);}
+.layadmin-tabs-select.layui-nav .layui-nav-item:hover {background-color: rgba(6, 39, 88, 1);}
+.layadmin-tabs-select.layui-nav .layui-nav-item a:hover {background-color: rgba(6, 39, 88, 1);}
+.layui-card {background-color: transparent !important;box-shadow: 0 1px 2px 0 rgba(255,255,255,1);}
+.layui-input, .layui-select, .layui-textarea {background-color: transparent;}
+.layui-table td, .layui-table th, .layui-table-col-set, .layui-table-fixed-r, .layui-table-grid-down, .layui-table-header, .layui-table-page, .layui-table-tips-main, .layui-table-tool, .layui-table-total, .layui-table-view, .layui-table[lay-skin=line], .layui-table[lay-skin=row] {
+    background-color: rgba(6, 39, 88, 1);
+    color: #FFFFFF;
+}
+.layui-table {background-color: transparent;}
+.layui-table tbody tr:hover, .layui-table thead tr, .layui-table-click, .layui-table-header, .layui-table-hover, .layui-table-mend, .layui-table-patch, .layui-table-tool, .layui-table-total, .layui-table-total tr, .layui-table[lay-even] tr:nth-child(even) {
+    background-color: rgba(6, 39, 88, 1);
+    color: #FFFFFF;
+}
+.layui-table-init {background-color: transparent !important;}
+.layui-table-tool .layui-inline[lay-event] { color: #FFFFFF; }
+.layui-table-grid-down:hover {background-color: rgba(6, 39, 88, 1);}
+.layui-table-page .layui-laypage span {color: #FFFFFF;}
+.layui-table-page .layui-laypage input {background-color: transparent; color: #FFFFFF;}
+.layui-table-page .layui-laypage button {background-color: transparent; color: #FFFFFF;}
+.layui-table-page select {background-color: transparent; color: #FFFFFF;}
+.layui-table-page select option {background-color: transparent; color: #000000;}
+.layui-table-page .layui-laypage a, .layui-table-page .layui-laypage span.layui-laypage-curr {color: #FFFFFF;}
+.layui-table-tool-panel {background-color: rgba(6, 39, 88, 1);}
+.layui-table-tool-panel li:hover {background-color: rgba(6, 39, 88, 1); color: rgba(255, 255, 255, .5)}
+.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary] span {color: #FFFFFF;}
+
+.layui-card-header {color: #FFFFFF;}
+.layui-layout-admin .layui-footer {background-color: rgba(6, 39, 88, 1); box-shadow: 0 -1px 2px 0 rgba(255, 255, 255, 1);}
+
+.layui-form-pane .layui-form-label {color: #FFFFFF; background-color: transparent;}
+
+.layui-breadcrumb a {color: #FFFFFF !important;}
+.layui-breadcrumb span[lay-separator] {color: #FFFFFF;}
+.layui-breadcrumb a cite {color: #FFFFFF;}
+.layui-input, .layui-textarea {color: #FFFFFF;}
+
+.layui-form-select dl {
+    background-color: rgba(6, 39, 88, 1);
+    color: rgba(255, 255, 255, .5)
+}
+.layui-form-select dl dd:hover {
+    background-color: rgba(6, 39, 88, 1);
+    color: rgba(255, 255, 255, 1)
+}
+i {color: #FFFFFF;}
+.layui-layer-title {background-color: rgba(6, 39, 88, 1) !important; color: #FFFFFF !important;}
+.layui-btn {background-color: rgba(6, 39, 88, 1); color: #FFFFFF; border: 1px solid #FFFFFF;}
+.layui-btn-group .layui-btn:first-child {border-left: 1px solid #FFFFFF;}
+
+.layui-form-checkbox[lay-skin=primary] i {
+    background-color: transparent;
+    color: transparent;
+}
+
+.layui-form-checked[lay-skin=primary] i {
+    border-color: #FFFFFF;
+    background-color: transparent;
+    color: #FFFFFF;
+}
+
+.layui-laypage .layui-laypage-curr .layui-laypage-em {background-color: transparent; border: 1px dotted #FFFFFF;}
+.layui-layout-admin .layui-header .layui-layout-right .layui-nav-child {background-color: rgba(6, 39, 88, 1);}
+.layui-elem-quote {background-color: transparent; border-left: 5px solid #EEEEEE; border-top: 1px solid #FFFFFF; border-right: 1px solid #FFFFFF; border-bottom: 1px solid #FFFFFF; color: #FFFFFF;}
+
+.layui-text h3 {color: #FFFFFF;}
+blockquote, body, button, dd, div, dl, dt, form, h1, h2, h3, h4, h5, h6, input, li, ol, p, pre, td, textarea, th, ul {color: #E6E6E6;}
+.layui-side-menu {box-shadow: 1px 0 2px 0 rgba(255, 255, 255, 1);}

src/main/resources/templates/cult/save.html

@@ -101,7 +101,7 @@
         </div>
     </div>
 </div>
-<div id="companiesTree" class="companiesTree" style="border:solid 1px #808080; display: none;background: #f9f9f9; position: absolute;z-index: 10;height: 250px;overflow: auto;overflow-x: hidden;">
+<div id="companiesTree" class="companiesTree" style="border:solid 1px #FFFFFF; display: none;background:rgba(6, 39, 88, 1); position: absolute;z-index: 10;height: 250px;overflow: auto;overflow-x: hidden;">
     <ul id="treeDemo" class="ztree" style="width:400px;">
     </ul>
 </div>

src/main/resources/templates/cult/update.html

@@ -101,7 +101,7 @@
         </div>
     </div>
 </div>
-<div id="companiesTree" class="companiesTree" style="border:solid 1px #808080; display: none;background: #f9f9f9; position: absolute;z-index: 10;height: 250px;overflow: auto;overflow-x: hidden;">
+<div id="companiesTree" class="companiesTree" style="border:solid 1px #FFFFFF; display: none;background:rgba(6, 39, 88, 1); position: absolute;z-index: 10;height: 250px;overflow: auto;overflow-x: hidden;">
     <ul id="treeDemo" class="ztree" style="width:400px;">
     </ul>
 </div>

src/main/resources/templates/house/list-summary.html

@@ -23,17 +23,17 @@
         #treeBody ul li.active{font-weight: bold;}
         #treeFooter {padding: 15px; border-top: 1px solid rgb(246, 246, 246);}
         #contentBody {width: 100%; height: 300px; position: relative; overflow: hidden; padding: 0px; border: 1px solid #e6e6e6; font-size: 0;}
-        #contentBody:after {content: ' '; display: block; position: absolute; top: 0; left: 0; background-color: #f2f2f2; width: 100px; height: 50px; z-index: 10; border: 1px solid #e6e6e6; box-sizing: border-box;}
-        #contentBody .left {width: 100px; position: absolute; top: 50px; left: 0px; user-select:none; background-color: #f2f2f2;}
+        #contentBody:after {content: ' '; display: block; position: absolute; top: 0; left: 0; width: 100px; height: 50px; z-index: 10; border: 1px solid #e6e6e6; box-sizing: border-box;}
+        #contentBody .left {width: 100px; position: absolute; top: 50px; left: 0px; user-select:none; }
         #contentBody .left .floor {height: 100px; border: 1px solid #e6e6e6; box-sizing: border-box; font-size: 14px; font-weight: bold; text-align: center; line-height: 100px;}
         #contentBody .top {height: 50px; position: absolute; top: 0px; left: 100px; white-space: nowrap;}
-        #contentBody .top .unit {width: 200px; height: 100%; border: 1px solid #e6e6e6; display: inline-block; box-sizing: border-box; font-size: 14px; font-weight: bold; text-align: center; line-height: 50px; user-select:none; background-color: #f2f2f2;}
+        #contentBody .top .unit {width: 200px; height: 100%; border: 1px solid #e6e6e6; display: inline-block; box-sizing: border-box; font-size: 14px; font-weight: bold; text-align: center; line-height: 50px; user-select:none; }
         #contentBody .center {margin-top: 50px; margin-left: 100px; overflow: scroll;}
         #contentBody .center .main {}
         #contentBody .center .main .floor {height: 100px; box-sizing: border-box; white-space: nowrap;}
         #contentBody .center .main .floor .unit {display: inline-block; box-sizing: border-box;}
         #contentBody .center .main .floor .unit .house {width: 200px; height: 100px; border: 1px solid #e6e6e6; box-sizing: border-box; display: inline-block; font-size: 14px; cursor: pointer; text-align: center; user-select:none; transition: background-color .3s, font-weight .3s;}
-        #contentBody .center .main .floor .unit .house:hover {font-weight: bold; background-color: #f2f2f2;}
+        #contentBody .center .main .floor .unit .house:hover {font-weight: bold; }
         #contentBody .center .main .floor .unit .house .info {display: flex; flex-direction: column; justify-content: space-between; align-items: center; height: 100%;}
         #contentBody .center .main .floor .unit .house .info .name .num {margin-top: 15px}
         #contentBody .center .main .floor .unit .house .info .name .time {scale: 0.8}
@@ -449,7 +449,7 @@
 
             var initData = function() {
                 if(!selectedRelation.buildingId) {
-                    $top.append(`<div style="font-size: 14px; width: ${$('#contentBody').width() - 100}px; height: 100%; display: flex; justify-content: center; align-items: center; border: 1px solid #e6e6e6; box-sizing: border-box; background-color: #f2f2f2;">请选择楼/排</div>`)
+                    $top.append(`<div style="font-size: 14px; width: ${$('#contentBody').width() - 100}px; height: 100%; display: flex; justify-content: center; align-items: center; border: 1px solid #e6e6e6; box-sizing: border-box; ">请选择楼/排</div>`)
                     return;
                 }
                 var loadLayerIndex;

src/main/resources/templates/populationinfo/save.html

@@ -822,7 +822,7 @@
         </div>
     </div>
 </div>
-<div id="companiesTree" class="companiesTree" style="border:solid 1px #808080; display: none;background: #f9f9f9; position: absolute;z-index: 10;height: 250px;overflow: auto;overflow-x: hidden;">
+<div id="companiesTree" class="companiesTree" style="border:solid 1px #FFFFFF; display: none;background:rgba(6, 39, 88, 1); position: absolute;z-index: 10;height: 250px;overflow: auto;overflow-x: hidden;">
     <ul id="treeDemo" class="ztree" style="width:400px;">
     </ul>
 </div>

src/main/resources/templates/populationinfo/update.html

@@ -820,7 +820,7 @@
         </div>
     </div>
 </div>
-<div id="companiesTree" class="companiesTree" style="border:solid 1px #808080; display: none;background: #f9f9f9; position: absolute;z-index: 10;height: 250px;overflow: auto;overflow-x: hidden;">
+<div id="companiesTree" class="companiesTree" style="border:solid 1px #FFFFFF; display: none;background:rgba(6, 39, 88, 1); position: absolute;z-index: 10;height: 250px;overflow: auto;overflow-x: hidden;">
     <ul id="treeDemo" class="ztree" style="width:400px;">
     </ul>
 </div>