nguage-html"></head> 7 
<body>
8 
	<div class="ipu-card ipu-card-block">
9 
		<div class="ipu-card-header">语音识别</div>
10 
		<div class="ipu-card-content">
11 
			<div class="ipu-card-content-inner" id="img">
12 
				点击开始唤起语音识别插件功能
13 
			</div>
14 
		</div>
15 
		<div class="ipu-card-footer">
16 
			<div class="ipu-flex-block ipu-flex-middle">
17 
				<div class="ipu-flex-grow-1">
18 
					<input class="search-input" type="text" id="search">
19 
				</div>
20 
				<div class="ipu-flex-grow-0 ipu-fn-p-l">
21 
					<button class="ipu-btn" id="start">开始</button>
22 
				</div>
23 
			</div>
24 
		</div>
25 
	</div>
26 
</body>
27 
</html>

+ 1 - 1
show-server/src/main/webapp/template/webapp/plugins/basic.html
Voir le fichier 

@ -127,8 +127,8 @@
127 127 
								</li>
128 128 
							</ul>
129 129 
						</div>
130
131 130 
					</div>
131
132 132
133 133 
					<!-- <div class="ipu-card">
134 134 
						<ul class="ipu-list ipu-list-function ipu-border-tb">

+ 10 - 0
show-server/src/main/webapp/template/webapp/plugins/index-list.html
Voir le fichier 

@ -150,5 +150,15 @@
150 150 
			<p>OCR</p>
151 151 
		</li>
152 152
153 
	    <li data-action="SysLocation">
154 
	        <div class="ipu-icon mdi mdi-map-marker"></div>
155 
	        <p>系统定位</p>
156 
	    </li>
157
158 
		<li data-action="asr">
159 
	        <div class="ipu-icon mdi mdi-kodi"></div>
160 
	        <p>语音识别</p>
161 
	    </li>
162
153 163 
	</ul>
154 164 
</div>

+ 15 - 0
show-server/src/main/webapp/template/webapp/plugins/photo.html
Voir le fichier 

@ -79,6 +79,21 @@
79 79 
							<button class="ipu-btn" id="add_text">测试</button>
80 80 
						</div>
81 81 
					</div>
82 
          <div class="ipu-card ipu-card-block">
83 
            <div class="ipu-card-header">拍照且识别照片中二维码</div>
84 
            <div class="ipu-card-content">
85 
              <div class="ipu-card-content-inner">
86 
                <div class="">调用结果信息</div>
87 
                <div id="qrcode_pic">
88 
                </div>
89 
                <div id="qrcode_path"></div>
90 
                <div id="qrcode_label"></div>
91 
              </div>
92 
            </div>
93 
            <div class="ipu-card-footer">
94 
              <button class="ipu-btn" id="take_qrcode_picture">测试</button>
95 
            </div>
96 
          </div>
82 97 
					<!-- 	<div class="demo-item">
83 98 
						<div class="demo-title">拍照</div>
84 99 
						<div class="ipu-card ">

+ 21 - 0
show-server/src/main/webapp/template/webapp/plugins/safe/gestureLock.html
Voir le fichier 

@ -53,6 +53,27 @@
53 53 
							</li>
54 54
55 55
56 
							<li class="ipu-list-item">
57 
								<div class="ipu-list-item-inner">
58 
									<div class="ipu-list-item-title">设置原生手势锁样式</div>
59 
									<div class="ipu-list-item-after">
60 
										<button class="ipu-btn ipu-btn-s" id="style_gesture1">设置样式</button>
61 
									</div>
62 
								</div>
63 
							</li>
64
65
66 
							<li class="ipu-list-item">
67 
								<div class="ipu-list-item-inner">
68 
									<div class="ipu-list-item-title">默认原生手势锁样式</div>
69 
									<div class="ipu-list-item-after">
70 
										<button class="ipu-btn ipu-btn-s" id="style_gesture0">还原样式</button>
71 
									</div>
72 
								</div>
73 
							</li>
74
75
76
56 77 
						</ul>
57 78 
					</div>
58 79

+ 55 - 0
show-server/src/main/webapp/template/webapp/plugins/sysLocation.html
Voir le fichier 

@ -0,0 +1,55 @@
1 
<!DOCTYPE html>
2 
<html>
3 
<head>
4 
<title>系统定位</title> {%>template/common/Head.html%}
5 
<script type="text/javascript"
6 
	src="biz/js/plugins/sysLocation.js"></script>
7 
</head>
8 
<body>
9
10 
	<div class="ipu-flex-row ipu-flex-vertical">
11 
		<div class="ipu-flex-col">
12 
			<header class="ipu-toolbar">
13 
				<h1 class="ipu-toolbar-title">系统定位</h1>
14 
				<a class="ipu-fn-left page-back" href="javascript:;"> <i
15 
					class="ipu-icon mdi mdi-chevron-left"></i>
16 
				</a>
17 
			</header>
18 
		</div>
19
20 
		<div class="ipu-flex-col ipu-flex-col-auto">
21 
			<div class="ipu-flex-content" id="mycontent">
22 
				<div class="page-content">
23 
					<div class="ipu-list">
24 
						<ul>
25
26 
							<li class="ipu-list-item">
27 
								<div class="ipu-list-item-inner">
28 
									<div class="ipu-list-item-title">调用系统定位功能</div>
29 
									<div class="ipu-list-item-after">
30 
										<button class="ipu-btn ipu-btn-s" id="sys_location">开始定位</button>
31 
									</div>
32 
								</div>
33 
							</li>
34
35 
						</ul>
36 
					</div>
37
38
39 
					<div class="ipu-card ipu-card-block">
40 
						<div class="ipu-card-content">
41 
							<div class="ipu-card-content-inner">
42 
								<div class="">系统定位回调信息</div>
43 
								<div id="syslocation_info"></div>
44 
							</div>
45 
						</div>
46 
					</div>
47
48
49 
				</div>
50 
			</div>
51 
		</div>
52
53 
	</div>
54 
</body>
55 
</html>

Merge remote-tracking branch 'origin/master' · 6e0f739a31 - Nuosi Git Service
Inicio Explorar Ayuda
Iniciar sesión
asiainfo
/
ebc
Vigilar 4
Destacar 0
Fork 0
Código Incidencias 0 Pull Requests 0 Commits 322 Releases 0 Wiki
Explorar el Código

Merge remote-tracking branch 'origin/master'

wangchao %!s(int64=4) %!d(string=hace) años
padre
7f6192df09 013e377cef
commit
6e0f739a31
Se han modificado 3 ficheros con 34 adiciones y 12 borrados
Dividir vista Mostrar estadísticas de diff
  1. 17 11
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceRulesServiceImpl.java
  2. 1 1
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/WorkOrderManagementServiceImpl.java
  3. 16 0
      security-protection-service/src/main/java/com/ai/bss/security/protection/utils/DateUtil.java

+ 17 - 11
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceRulesServiceImpl.java
Ver fichero 

@ -194,30 +194,36 @@ public class AttendanceRulesServiceImpl implements AttendanceRulesService {
194 194 
            attendanceRuleDto.setPlanCycleType(workTaskSpecPlan.getPlanCycleType());
195 195 
            attendanceRuleDto.setPlanMemo(workTaskSpecPlan.getPlanMemo());
196 196 
            attendanceRuleDto.setWorkTaskSpecPlanId(workTaskSpecPlan.getWorkTaskSpecPlanId());
197
197 
            Map monthStartMap = new HashMap();
198 
            Map monthEndMap = new HashMap();
198 199 
            if(!workTaskSpecPlan.getPlanCycleType().equals(WorkTaskSpecPlan.PLAN_CYCLE_TYPE_NATURE_MONTH)){
199 200 
                String beginTime =DateUtil.formatDate(workTaskSpecPlan.getBeginTime(),DateUtil.NORM_YYYY_MM_PATTERN);
200 201 
                String endTime =DateUtil.formatDate(workTaskSpecPlan.getEndTime(),DateUtil.NORM_YYYY_MM_PATTERN);
201 202 
                String beginDay =DateUtil.formatDate(workTaskSpecPlan.getBeginTime(),DateUtil.NORM_DAY_PATTERN);
202 203 
                String endDay =DateUtil.formatDate(workTaskSpecPlan.getEndTime(),DateUtil.NORM_DAY_PATTERN);
203 
                Map monthStartMap = new HashMap();
204 
                Map monthEndMap = new HashMap();
205 204 
                if(beginTime.equals(DateUtil.getThisMonth())){
206 
                    monthStartMap.put("type","0");//本月类型
205 
                    monthStartMap.put("type",0);//本月类型
207 206 
                }else{
208 
                    monthStartMap.put("type","-1");//上个月类型
207 
                    monthStartMap.put("type",-1);//上个月类型
209 208 
                }
210 
                monthStartMap.put("day",beginDay);
209 
                monthStartMap.put("day",Integer.parseInt(beginDay));
211 210 
                if(endTime.equals(DateUtil.getNextMonth())){
212 
                    monthEndMap.put("type","1");//下个月类型
211 
                    monthEndMap.put("type",1);//下个月类型
213 212 
                }else{
214 
                    monthEndMap.put("type","0");//本月类型
213 
                    monthEndMap.put("type",0);//本月类型
215 214 
                }
216 
                monthEndMap.put("day",endDay);
217 
                attendanceRuleDto.setMonthStart(monthStartMap);
218 
                attendanceRuleDto.setMonthEnd(monthEndMap);
215 
                monthEndMap.put("day",Integer.parseInt(endDay));
216 
            }else{
217 
                //自然月返回本月第一天和本月最后一天
218 
                monthStartMap.put("type",0);
219 
                monthStartMap.put("day",1);
220 
                monthEndMap.put("type",0);
221 
                monthEndMap.put("day",DateUtil.getThisMonthLastDay(DateUtil.NORM_DAY_PATTERN));
222
219 223 
            }
220 224
225 
            attendanceRuleDto.setMonthStart(monthStartMap);
226 
            attendanceRuleDto.setMonthEnd(monthEndMap);
221 227 
            workTaskSpecPlan.setBeginTime(workTaskSpecPlan.getBeginTime());
222 228 
            workTaskSpecPlan.setEndTime(workTaskSpecPlan.getEndTime());
223 229 
            attendanceRuleDto.setName(attendanceTaskSpec.getName());

+ 1 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/WorkOrderManagementServiceImpl.java
Ver fichero 

@ -69,7 +69,7 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
69 69 
		Map<String, String> allTypeMap = charSpecService.getCharSpecMap(EbcConstant.BUSINESS_SPEC_WORK_ORDER_TYPE);
70 70
71 71 
		for (Map<String, Object> map : list) {
72 
			map.put("approvalTypeName", allTypeMap.get(map.get("appovalSubType").toString()));
72 
			map.put("approvalTypeName", allTypeMap.get(map.get("appovalSubType")==null?"":map.get("appovalSubType").toString()));
73 73
74 74 
			JSONObject charValueJsonObj = JSONObject.parseObject(map.get("charValueSet").toString());
75 75 
			map.put("reclockingTime", charValueJsonObj.getString("reclockingTime"));

+ 16 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/utils/DateUtil.java
Ver fichero 

@ -517,4 +517,20 @@ public class DateUtil {
517 517 
		return accDate;
518 518 
	}
519 519
520 
	/**
521 
	 * 获取当月最后一天
522 
	 * @return
523 
	 */
524 
	public static int getThisMonthLastDay(String pattern){
525 
		//设置时间格式
526 
		SimpleDateFormat format = new SimpleDateFormat(pattern);
527 
		//获得实体类
528 
		Calendar ca = Calendar.getInstance();
529 
		//设置最后一天
530 
		ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
531 
		//最后一天格式化
532 
		String lastDay = format.format(ca.getTime());
533 
		return Integer.parseInt(lastDay);
534 
	}
535
520 536 
}