Browse Source

new 增加 服务管理 修改

bzd_lxf 5 months ago
parent
commit
59dbe771ff

+ 24 - 20
health-admin/src/main/java/com/bzd/web/controller/server/ServerGController.java

@@ -4,32 +4,18 @@ package com.bzd.web.controller.server;
 import com.bzd.common.annotation.Log;
 import com.bzd.common.core.controller.BaseController;
 import com.bzd.common.core.domain.AjaxResult;
-import com.bzd.common.core.domain.entity.ServerG;
-import com.bzd.common.core.domain.entity.SysRole;
-import com.bzd.common.core.domain.entity.SysUser;
 import com.bzd.common.core.page.TableDataInfo;
-import com.bzd.common.core.text.Convert;
 import com.bzd.common.enums.BusinessType;
-import com.bzd.common.utils.DateUtils;
-import com.bzd.common.utils.ShiroUtils;
-import com.bzd.common.utils.StringUtils;
-import com.bzd.common.utils.poi.ExcelUtil;
-import com.bzd.framework.shiro.util.AuthorizationUtils;
 import com.bzd.system.service.IServerGService;
 import com.bzd.common.config.dao.PageData;
 import com.bzd.system.service.ServerService;
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 服务管理
@@ -45,6 +31,7 @@ public class ServerGController extends BaseController{
 
     @Autowired
     private ServerService service;
+    private Object server;
 
     @RequiresPermissions("server:serv:view")
     @GetMapping()
@@ -103,14 +90,31 @@ public class ServerGController extends BaseController{
 
     @RequiresPermissions("server:serv:edit")
     @GetMapping("/edit/{serviceId}")
-    public ModelAndView view(@PathVariable("serviceId") Long serviceId)throws Exception
+    public String view(@PathVariable("serviceId") Long serviceId, ModelMap mmap)throws Exception
     {
-        ModelAndView mv = new ModelAndView();
         PageData pd = this.getPageData();
         pd.put("serviceId",serviceId);
-        //List<PageData> pageData = service.find(pd);
-        mv.addObject("server",service.find(pd).get(0));
-        mv.setViewName(prefix + "/edit");
-        return mv;
+        PageData pageData = service.find(pd).get(0);
+        mmap.putAll(pageData);
+        return prefix + "/edit";
     }
+
+    /**
+     * 保存修改信息
+     */
+    @RequiresPermissions("server:user:edit")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave() throws Exception
+    {
+        PageData pd = this.getPageData();
+        Integer update = service.update(pd);
+        if(update!=1){
+            return error("修改失败");
+        }
+        return toAjax(service.update(pd));
+    }
+
+
 }

+ 39 - 21
health-admin/src/main/resources/templates/server/serv/edit.html

@@ -5,58 +5,76 @@
 </head>
 <body>
     <div class="main-content">
-        <form class="form-horizontal" th:object="${server}">
+        <form class="form-horizontal" id="form-server-edit" th:object="${server}">
             <h4 class="form-header h4">基本信息</h4>
-            <p th:text="${number}">42</p>
-           <!-- <p th:text="${server.serviceTypeNumber}">42</p>-->
-            <input name="serviceTypeNumber" placeholder="请输入服务类型编号" class="form-control" type="text" maxlength="30"
-                   th:field="*{serviceTypeNumber}" required>
+            <input type="hidden" id="serviceId" name="serviceId" th:value="${serviceId}">
             <div class="row">
                 <div class="col-sm-12">
                     <div class="form-group">
-                        &lt;!&ndash;is-required 增加星号 显示为必填&ndash;&gt;
-                        &lt;!&ndash;<label class="col-sm-4 control-label is-required">服务类型编号:</label>&ndash;&gt;
-                        <label class="col-sm-4 control-label">服务类型编号:</label>
-                        <div class="col-sm-6">
+                        <!--is-required 增加星号 显示为必填-->
+                        <label class="col-sm-5 control-label">服务类型编号:</label>
+                        <div class="col-sm-4" >
                             <div class="input-group">
-                                <input name="serviceTypeNumber" placeholder="请输入服务类型编号" class="form-control" type="text" maxlength="30" th:field="*{server.serviceTypeNumber}" required>
+                                <input name="serviceTypeNumber" placeholder="请输入服务类型编号" class="form-control" type="text" maxlength="30" th:value="${serviceTypeNumber}" required>
                             </div>
                         </div>
                     </div>
                 </div>
-                <!--<div class="col-sm-12">
+                <div class="col-sm-12">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">服务类型名称:</label>
-                        <div class="col-sm-6">
+                        <label class="col-sm-5 control-label">服务类型名称:</label>
+                        <div class="col-sm-4">
                             <div class="input-group">
-                                <input name="serviceTypeName" placeholder="请输入服务类型名称" class="form-control" type="text" maxlength="30" th:field="*{serviceTypeName}" required>
+                                <input name="serviceTypeName" placeholder="请输入服务类型名称" class="form-control" type="text" maxlength="30" th:value="${serviceTypeName}" required>
                             </div>
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-12">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">服务类型描述:</label>
-                        <div class="col-sm-6">
+                        <label class="col-sm-5 control-label">服务类型描述:</label>
+                        <div class="col-sm-4">
                             <div class="input-group">
-                                <input name="serviceTypeDescription" placeholder="请输入服务类型描述" class="form-control" type="text" maxlength="30" th:field="*{serviceTypeDescription}" required>
+                                <input name="serviceTypeDescription" placeholder="请输入服务类型描述" class="form-control" type="text" maxlength="30" th:value="${serviceTypeDescription}" required>
                             </div>
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-12">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">履约方:</label>
-                        <div class="col-sm-6">
+                        <label class="col-sm-5 control-label">履约方:</label>
+                        <div class="col-sm-4">
                             <div class="input-group">
-                                <input name="fulfillmentParty" placeholder="履约方" class="form-control" type="text" maxlength="30" th:field="*{fulfillmentParty}" required>
+                                <input name="fulfillmentParty" placeholder="履约方" class="form-control" type="text" maxlength="30" th:value="${fulfillmentParty}" required>
                             </div>
                         </div>
                     </div>
-                </div>-->
+                </div>
             </div>
         </form>
     </div>
+    <div class="main-content">
+        <div class="col-sm-offset-5 col-sm-10">
+            <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+            <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
+        </div>
+    </div>
 	<th:block th:include="include :: footer" />
 </body>
 </html>
+
+<script>
+    function submitHandler() {
+        var prefix = ctx + "server/serv";
+        if ($.validate.form()) {
+            var data = $("#form-server-edit").serializeArray();
+            /*var status = $("input[id='status']").is(':checked') == true ? 0 : 1;
+            var roleIds = $.form.selectCheckeds("role");
+            var postIds = $.form.selectSelects("post");
+            data.push({"name": "status", "value": status});
+            data.push({"name": "roleIds", "value": roleIds});
+            data.push({"name": "postIds", "value": postIds});*/
+            $.operate.saveTab(prefix + "/edit", data);
+        }
+    }
+</script>

+ 4 - 0
health-system/src/main/java/com/bzd/system/service/ServerService.java

@@ -33,4 +33,8 @@ public class ServerService {
     public Integer del(PageData pd) throws Exception {
         return daoSupport.delete("ServerMapper.deleteServer", pd);
     }
+
+    public Integer update(PageData pd) throws Exception {
+        return daoSupport.delete("ServerMapper.updateServer", pd);
+    }
 }

+ 11 - 0
health-system/src/main/resources/mapper/system/ServerMapper.xml

@@ -37,5 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	</delete>
 
+	<insert id="updateServer" parameterType="pd">
+		update s_ffgl_servicetypeinfo
+		<trim prefix=" SET " suffix="" prefixOverrides="," suffixOverrides=",">
+			<if test="serviceTypeNumber != null ">serviceTypeNumber=#{serviceTypeNumber},</if>
+			<if test="serviceTypeName != null ">serviceTypeName=#{serviceTypeName},</if>
+			<if test="serviceTypeDescription != null ">serviceTypeDescription=#{serviceTypeDescription},</if>
+			<if test="fulfillmentParty != null ">fulfillmentParty=#{fulfillmentParty},</if>
+		</trim>
+		where serviceId=#{serviceId}
+	</insert>
+
 
 </mapper>